diff --git a/client/cat3/Gruntfile.js b/client/cat3/Gruntfile.js
index 0ef665e08..8619729ba 100644
--- a/client/cat3/Gruntfile.js
+++ b/client/cat3/Gruntfile.js
@@ -82,14 +82,12 @@ module.exports = function(grunt) {
 					{'catalyst/partials/global.css':'src/partials/global.scss'},
 					{'catalyst/partials/globals/treeComponent/treeDirective.css':'src/partials/globals/treeComponent/treeDirective.scss'},
 					{'catalyst/partials/sections/dashboard/workzone/workzone.css':'src/partials/sections/dashboard/workzone/workzone.scss'},
-					{'catalyst/partials/sections/dashboard/workzone/workzoneTreeMenu/workzoneTreeMenu.css':'src/partials/sections/dashboard/workzone/workzoneTreeMenu/workzoneTreeMenu.scss'},
 					{'catalyst/partials/sections/dashboard/workzone/instance/instance.css':'src/partials/sections/dashboard/workzone/instance/instance.scss'},			 
 					{'catalyst/partials/sections/dashboard/workzone/blueprint/blueprint.css':'src/partials/sections/dashboard/workzone/blueprint/blueprint.scss'},
 					{'catalyst/partials/sections/dashboard/workzone/cloudFormation/cloudFormation.css':'src/partials/sections/dashboard/workzone/cloudFormation/cloudFormation.scss'},
 					{'catalyst/partials/sections/dashboard/workzone/container/container.css':'src/partials/sections/dashboard/workzone/container/container.scss'},
 					{'catalyst/partials/sections/dashboard/workzone/orchestration/orchestration.css':'src/partials/sections/dashboard/workzone/orchestration/orchestration.scss'},
 					{'catalyst/partials/sections/dashboard/workzone/application/application.css':'src/partials/sections/dashboard/workzone/application/application.scss'},
-					{'catalyst/partials/sections/dashboard/analytics/view/analyticsTreeMenu.css':'src/partials/sections/dashboard/analytics/view/analyticsTreeMenu.scss'},
 					{'catalyst/partials/sections/dashboard/analytics/analytics.css':'src/partials/sections/dashboard/analytics/analytics.scss'},
 					{'catalyst/partials/sections/dashboard/setting/setting.css':'src/partials/sections/dashboard/setting/setting.scss'}
 				]
diff --git a/client/cat3/main.html b/client/cat3/main.html
index 95edfdc7a..aca95dc2f 100644
--- a/client/cat3/main.html
+++ b/client/cat3/main.html
@@ -53,8 +53,14 @@
 		</div>
 		<div class="breadcrumb-wrapper">
 			<div class="container-fluid" id="breadcrumb-block" ng-controller="breadcrumbCtrl" ng-show="isBreadCrumbAvailable">
-				<div ng-cloak id="section-name" class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
-					{{sectionName}}
+				<div class="col-lg-2 col-md-2 col-sm-2 col-xs-2 no-padding">
+					<div id="section-name">
+						<span ng-mouseover="showTreeOverlay()" ng-mouseleave="hideTreeOverlay()" class="cursor">
+			                <i class="fa fa-bars tree-toggle">
+			                </i>
+			                Menu
+			            </span>
+					</div>
 				</div>
 				<div id="breadcrumb-nav" class="col-lg-10 col-md-10 col-sm-10 col-xs-10">
 					<ul>
@@ -97,6 +103,8 @@
 		<script src="src/partials/sections/dashboard/analytics/controller/capacityCtrl.js"></script>
 		<script src="src/partials/sections/dashboard/analytics/controller/usageCtrl.js"></script>
 		<script src="src/partials/sections/dashboard/design/designCtrl.js"></script>
+		<script src="src/partials/sections/dashboard/design/controllers/blueprintCreateCtrl.js"></script>
+		<script src="src/partials/sections/dashboard/design/controllers/blueprintListCtrl.js"></script>
 		<script src="src/partials/sections/dashboard/help/helpCtrl.js"></script>
 		<script src="src/partials/sections/dashboard/setting/organization/organizationCtrl.js"></script>
 		<script src="src/partials/sections/dashboard/setting/organization/organizationListCtrl.js"></script>
diff --git a/client/cat3/src/clientRoutes.js b/client/cat3/src/clientRoutes.js
index 131f202c3..51a1e0232 100644
--- a/client/cat3/src/clientRoutes.js
+++ b/client/cat3/src/clientRoutes.js
@@ -56,7 +56,7 @@ function routeConfig($stateProvider, $urlRouterProvider, $httpProvider, modulePe
 	}).state('dashboard.design', {
 		url: "/design",
 		templateUrl: "src/partials/sections/dashboard/design/design.html",
-		controller: "designCtrl",
+		controller: "designCtrl as desCtrl",
 		resolve: {
 			auth: ["$q", function ($q) {
 				var deferred = $q.defer();
diff --git a/client/cat3/src/main.js b/client/cat3/src/main.js
index e8a2bf542..d3f379fbc 100644
--- a/client/cat3/src/main.js
+++ b/client/cat3/src/main.js
@@ -30,9 +30,15 @@ var angularApp = angular.module('catapp', ['ui.router','ngTouch','toastr',
 	'global.messages'
 ]);
 
-angularApp.run(['$rootScope', 'auth', '$state', '$stateParams',
-	function ($rootScope, Auth, $state, $stateParams) {
+angularApp.run(['$rootScope', 'auth', '$state', '$stateParams','$http','$window',
+	function ($rootScope, Auth, $state, $stateParams,$http,$window) {
 		'use strict';
+		$http.get('/organizations/getTreeNew').success(function (result) {
+			// if(result.data && result.data.length >0){
+			// 	console.log(result);
+			// 	$window.location.href="/private/index.html#ajax/Settings/Dashboard.html";
+			// }
+		});
 		$rootScope.$on('$stateChangeStart', function (event, toState) {
 			//More function params: function (event, toState, toParams, fromState, fromParams)
 			function checkAuthentication() {
diff --git a/client/cat3/src/partials/global.scss b/client/cat3/src/partials/global.scss
index 942c84cfb..4f2af2de7 100644
--- a/client/cat3/src/partials/global.scss
+++ b/client/cat3/src/partials/global.scss
@@ -4,39 +4,39 @@ $imagePath : "../../../../../../cat3/images";
 
 /*CSS for defining colors Globally starts*/
 .fa {
-	@include theme-text-color; 
+    @include theme-text-color; 
 }
 .green {
-	color: $color-green;
+    color: $color-green;
 }
 
 .blue {
-	@include theme-text-color;
+    @include theme-text-color;
 }
 
 .red {
-	color: $color-red;
+    color: $color-red;
 }
 
 .orange {
-	color: $color-orange;
+    color: $color-orange;
 }
 
 .active-color, .selectedView {
-	color: $selected-color !important;
+    color: $selected-color !important;
 }
 /*CSS for defining colors Globally ends*/
 
 .cursor {
-	cursor: pointer;
+    cursor: pointer;
 }
 
 .white {
-	color: #fff;
+    color: #fff;
 }
 
 .black {
-	color: #333;
+    color: #333;
 }
 
 .errorMsg {
@@ -44,128 +44,266 @@ $imagePath : "../../../../../../cat3/images";
 }
 
 .inputValidationMsg {
-	color: $color-red;
-	font-size: 11px;
-	font-style: italic;
-	vertical-align: top;
-	font-weight: normal;
+    color: $color-red;
+    font-size: 11px;
+    font-style: italic;
+    vertical-align: top;
+    font-weight: normal;
 }
 
 /*CSS to overwrite input background color for autofill*/
 #loginPage, #instanceSSHPage {
-	input:-webkit-autofill {
-	    -webkit-box-shadow: 0 0 0px 1000px white inset;
-	}
+    input:-webkit-autofill {
+        -webkit-box-shadow: 0 0 0px 1000px white inset;
+    }
 }
 
 /*CSS for header,breadcrumb and tree starts*/
 #breadcrumb-block { 
-	@include theme-bg-color;
-	color: white;
+  @include theme-bg-color;
+  color: white;
+}
+
+.tree-toggle {
+  z-index: 100;
+  color: #fff;
+  font-size: 1.2em;
+  padding: 6px 0px 6px 12px;
 }
 
 #section-name {
-	padding: 6px 10px 6px 10px;
-	font-size: 14px; 
-	font-weight: bold;
+    font-size: 14px;
+    font-weight: bold;
+
+    .menu-icon {
+      float: left;
+      height: 40px;
+      font-size: 20px;
+    }
+
+    .menu-text {
+      float: left;
+      margin: 11px 0 0 5px;
+      color: #fff;
+      height: 29px;
+    }
 }
 
 #breadcrumb-nav {
-	padding-top: 6px;
-	padding-left: 60px;
+    padding-top: 6px;
+    padding-left: 60px;
 }
 
 #breadcrumb-block #breadcrumb-nav ul {
-	margin: 0px;
-	padding: 0px;
+    margin: 0px;
+    padding: 0px;
 }
 
 #breadcrumb-block #breadcrumb-nav ul li {
-	list-style: none;
-	display: inline;
+    list-style: none;
+    display: inline;
+}
+
+/*CSS for tree starts here*/
+#navigPage {
+  background: transparent;
+  position: fixed;
+  width: 254px;
+  z-index: 10;
+    height: 100% !important;
+  transition: all .4s ease 0s;
+  left: -254px;
+    font-size: 12px !important;
+
+
+  &.show-left-tree {
+      left: 0px;
+  }
+
+  #navigPage-inner {
+      background: linear-gradient(to right, #2c3638 99%, #2c3638 100%);
+      color: #fff;
+      overflow-y: auto;
+      height: 100% !important;
+  }
+
+  div[data-angular-treeview] {
+      color: #fff;
+      font-size: 12px;
+      font-family: "Open Sans", Arial, Helvetica, Sans-Serif;
+  }
+
+  div[data-tree-model] li .selected {
+      padding: 0px;
+  }
+
+  div[data-tree-model] li span:hover {
+      text-decoration: underline;
+  }
+
+  div[data-tree-model] li {
+      line-height: 2.2;
+      padding: 0;
+  }
+      
+  div[data-tree-model] ul {
+      margin-left:-10px;
+      ul {
+          margin-left:-20px;
+          ul {
+              margin-left:-30px;
+              ul {
+                  margin-left:-40px;
+              }
+          }
+      }
+  }
+
+  div[data-tree-model] .liContents {
+      margin-left: 20px;
+      .liContents  {
+          margin-left: 30px;
+          .liContents {
+              margin-left: 40px;
+              .liContents {
+                  margin-left: 50px;
+              }
+          }
+      }
+  }
+
+  div[data-tree-model] li.selected{
+      background:#3b4142;
+  }
+
+  .collapse-spacing {
+      padding-right: 10px;
+  }
+
+  .label-spacing {
+      padding-right: 5px;
+  }
+
+  .caret-spacing {
+      margin-top: 8px;
+  }
+
+  i,span {
+      color:#fff;
+  }
+}
+
+#analyticsTreeMenuPage {
+  #navigPage {
+    .tree-ul {
+      padding: 0px;
+    }
+
+    .liContents {
+      line-height: 2.2;
+
+      .liContents-wrapper {
+        margin-left: 15px;
+      }
+
+      .caret-spacing {
+        margin-top: 8px;
+      }
+
+      .fa {
+        margin-left: 15px;
+      }
+    }
+
+    .activeSection {
+      font-weight: bold;
+      background: #3b4142;
+    }
+  }
 }
+/*CSS for tree ends here*/
 
 @media (min-width : 0px) and (max-width: 767px) {
-	#breadcrumb-nav {
-		display: none;
-	}
+    #breadcrumb-nav {
+        display: none;
+    }
 }
 
 @media (min-width : 0px) and (max-width: 320px) {
-	.selectCookbooksandRecipesdiv {
-		width: 85%;
+    .selectCookbooksandRecipesdiv {
+        width: 85%;
 
-		.selectCookbooksandRecipes {
-			min-width: 150px;
-			width: 89%;
-		}
-	}
+        .selectCookbooksandRecipes {
+            min-width: 150px;
+            width: 89%;
+        }
+    }
 
-	.smart-form {
-		.marginleft6 {
-		    margin: 35% 0% 0 0;
-		    float: right;
-		    width: 13%;
-		}
-	}
+    .smart-form {
+        .marginleft6 {
+            margin: 35% 0% 0 0;
+            float: right;
+            width: 13%;
+        }
+    }
 
-	.logsArea {
-    	height: 180px;
+    .logsArea {
+        height: 180px;
     }
 }
 
 @media (min-width : 321px) and (max-width: 480px) {
-	.selectCookbooksandRecipesdiv {
-		.selectCookbooksandRecipes {
-			min-width: 289px;
-		}
-	}
+    .selectCookbooksandRecipesdiv {
+        .selectCookbooksandRecipes {
+            min-width: 289px;
+        }
+    }
 
-	#newTaskPage {
-		.left-right-selection {
-			margin: 20% 6% 0 0;
-		}
-	}
+    #newTaskPage {
+        .left-right-selection {
+            margin: 20% 6% 0 0;
+        }
+    }
 
-	.logsArea {
-    	height: 30px;
+    .logsArea {
+        height: 30px;
     }
 }
 
 @media (min-width : 0px) and (max-width: 480px) {
-	#instancePage, #bluePrintPage, #cloudFormationPage, #containerPage, #orchestrationPage, #applicationPage {
-		.panel-heading {
-	    	padding: 2px 15px;
-	    	height: 23px;
-
-	    	.panel-title {
-	    		font-size: 12px;
-	    	}
-	    }
-	}
-
-	.breadcrumb-wrapper {
-		#breadcrumb-block {
-			height: 22px;
-			min-height: 22px;
-
-			#section-name {
-			    padding: 3px 10px 2px 40px;
-			    font-size: 12px;
-			}
-		}
-	}
+    #instancePage, #bluePrintPage, #cloudFormationPage, #containerPage, #orchestrationPage, #applicationPage {
+        .panel-heading {
+            padding: 2px 15px;
+            height: 23px;
+
+            .panel-title {
+                font-size: 12px;
+            }
+        }
+    }
+
+    .breadcrumb-wrapper {
+        #breadcrumb-block {
+            height: 22px;
+            min-height: 22px;
+
+            #section-name {
+                padding: 3px 10px 2px 40px;
+                font-size: 12px;
+            }
+        }
+    }
 }
 
 @media (min-width : 768px) and (max-width: 991px) {
-	.logsArea {
-    	height: 710px;
+    .logsArea {
+        height: 710px;
     }
 }
 
 @media (min-width: 991px) {
-	.logsArea {
-    	height: 413px;
+    .logsArea {
+        height: 413px;
     }
 }
 
@@ -173,288 +311,288 @@ $imagePath : "../../../../../../cat3/images";
 
 /*Used by loader module for different loader sizes*/
 .catloader.very-large {
-	font-size: 40px;
+    font-size: 40px;
 }
 
 .catloader.large {
-	font-size: 30px;
+    font-size: 30px;
 }
 
 /*default size is medium*/
 .catloader,.catloader.medium {
-	font-size: 20px;
+    font-size: 20px;
 }
 
 .catloader.small {
-	font-size: 14px;
+    font-size: 14px;
 }
 
 .catloader.very-small {
-	font-size: 12px;
+    font-size: 12px;
 }
 /*Loader sizes end*/
 
 /*Global Confirmation Modal Buttons Styles starts*/
 .cat-btn-update, .cat-btn-save {
-	color: #fff;  
-	@include btn-theme; 
+    color: #fff;  
+    @include btn-theme; 
 }
 
 .cat-btn-cancel, .cat-btn-close { 
-	color: #333; 
-	background-color: #fff; 
-	border-color: #ccc; 
+    color: #333; 
+    background-color: #fff; 
+    border-color: #ccc; 
 }
 
 .cat-btn-cancel:hover, .cat-btn-close:hover {  
-	color: #333; 
-	background-color: #e6e6e6; 
-	border-color: #adadad;
+    color: #333; 
+    background-color: #e6e6e6; 
+    border-color: #adadad;
 }
 
 .cat-btn-delete { 
-	color: #fff; 
-	background-color: #d9534f; 
-	border-color: #d43f3a; 
+    color: #fff; 
+    background-color: #d9534f; 
+    border-color: #d43f3a; 
 }
 
 .cat-btn-delete:hover {  
-	color: #fff; 
-	background-color: #c9302c; 
-	border-color: #ac2925;
+    color: #fff; 
+    background-color: #c9302c; 
+    border-color: #ac2925;
 }
 /*Global Confirmation Modal Buttons Styles ends*/
 
 /*CSS for Composite Component Starts*/
 #optionSelector, #selectorList {
-	width: 100%; 
-	height: 250px;   
+    width: 100%; 
+    height: 250px;   
 }
 
 .left-right-selection {
-	float: right;
-	margin: 30% 2% 0 0;
+    float: right;
+    margin: 30% 2% 0 0;
 }
 
 .selectCookbooksandRecipesdivLeft, .selectCookbooksandRecipesdivRight {
-	width: 80%;
+    width: 80%;
 }
 
 .selectCookbooksandRecipesdivLeft {
-	margin: 0 0 0 10px;
+    margin: 0 0 0 10px;
 }
 
 #btnaddToRunlist, #btnremoveFromRunlist, #btnRunlistItemUp, #btnRunlistItemDown {
-	border-radius: 50%;
+    border-radius: 50%;
 }
 
 #btnaddToRunlist, #btnremoveFromRunlist {
-	padding: 5px 10px;
+    padding: 5px 10px;
 }
 
 #btnRunlistItemUp, #btnRunlistItemDown {
-	padding: 5px 8px;
+    padding: 5px 8px;
 }
 
 .anchorRemove, .anchorDown {
-	margin-top: 50%;
+    margin-top: 50%;
 }
 
 .paddingbottom15 {
-	padding: 0 0 17px 0;
+    padding: 0 0 17px 0;
 }
 
 option.jenkins, option.chef, option.composite, option.puppet , option.script {
-	background-repeat: no-repeat !important;
-	height: 26px;
-	padding-left: 36px;
-	padding-top: 6px;
-	background-position: 4px 2px !important;
-	font-size: 12px;
-	background-size: 24px auto !important;
+    background-repeat: no-repeat !important;
+    height: 26px;
+    padding-left: 36px;
+    padding-top: 6px;
+    background-position: 4px 2px !important;
+    font-size: 12px;
+    background-size: 24px auto !important;
 }
 
 option.jenkins {
-	background: url("#{$imagePath}/orchestration/jenkins.png");
+    background: url("#{$imagePath}/orchestration/jenkins.png");
 }
 
 option.chef {
-	background: url("#{$imagePath}/orchestration/chef.png");
+    background: url("#{$imagePath}/orchestration/chef.png");
 }
 
 option.composite {
-	background: url("#{$imagePath}/orchestration/composite.png");
+    background: url("#{$imagePath}/orchestration/composite.png");
 }
 
 option.puppet {
-	background: url("#{$imagePath}/global/puppet.png");
+    background: url("#{$imagePath}/global/puppet.png");
 }
 
 option.script {
-	background: url("#{$imagePath}/orchestration/script.jpg");	
+    background: url("#{$imagePath}/orchestration/script.jpg");	
 }
 /*CSS for Composite Component ends*/
 
 /*CSS for Chef Component Starts here*/
 .runlistLabel {
-	width: 100%;
-	height: 35px;
+    width: 100%;
+    height: 35px;
 }
 
 .searchCookbooksRolesLabel {
-	width: 76%;
-	position: relative;
+    width: 76%;
+    position: relative;
 }
 
 .smart-form {
-	margin: 0;
-	outline: 0;
-	color: #666;
-	position: relative;
-
-	.row {
-		margin: 10px 0px;
-	}
-
-	label {
-		vertical-align: middle;
-	}
-
-	.icon-append {
-		right: 5px;
-		padding-left: 3px;
-		border-left-width: 1px;
-		border-left-style: solid;
-		position: absolute;
-		top: 5px;
-		width: 22px;
-		height: 22px;
-		font-size: 14px;
-		line-height: 22px;
-		text-align: center;
-		z-index: 1;
-		color: #A2A2A2;
-	}
-
-	.input input {
-		display: block;
-		width: 100%;
-		padding: 8px 10px;
-		outline: 0;
-		border-width: 1px;
-		border-style: solid;
-		border-radius: 0;
-		background: #fff;
-		color: #404040;
-		border-color: #ccc;
-	}
+    margin: 0;
+    outline: 0;
+    color: #666;
+    position: relative;
+
+    .row {
+        margin: 10px 0px;
+    }
+
+    label {
+        vertical-align: middle;
+    }
+
+    .icon-append {
+        right: 5px;
+        padding-left: 3px;
+        border-left-width: 1px;
+        border-left-style: solid;
+        position: absolute;
+        top: 5px;
+        width: 22px;
+        height: 22px;
+        font-size: 14px;
+        line-height: 22px;
+        text-align: center;
+        z-index: 1;
+        color: #A2A2A2;
+    }
+
+    .input input {
+        display: block;
+        width: 100%;
+        padding: 8px 10px;
+        outline: 0;
+        border-width: 1px;
+        border-style: solid;
+        border-radius: 0;
+        background: #fff;
+        color: #404040;
+        border-color: #ccc;
+    }
 }
 
 .chef-client-loader-wrapper {
-	margin: 6px 0;
+    margin: 6px 0;
 }
 
 .runlist-section {
-	padding: 10px 0 0 0;
+    padding: 10px 0 0 0;
 }
 
 .marginleft6 {
-	margin-left: 6%;
+    margin-left: 6%;
 }
 
 .selectCookbooksandRecipes {
-	height: 250px !important;
-	margin-bottom: 10px;
-	border-width: 1px 1px 1px 2px;
-	border-style: solid;
-	border-color: #ccc;
-	width: 203px;
+    height: 250px !important;
+    margin-bottom: 10px;
+    border-width: 1px 1px 1px 2px;
+    border-style: solid;
+    border-color: #ccc;
+    width: 203px;
 }
 
 .cookbook, .deploy {
-	background: url("#{$imagePath}/global/cookbook.png") no-repeat;
-	background-repeat: no-repeat;
-	height: 24px;
-	padding-left: 36px;
-	padding-top: 6px;
-	background-position: 4px 2px;
-	font-size: 12px; 
+    background: url("#{$imagePath}/global/cookbook.png") no-repeat;
+    background-repeat: no-repeat;
+    height: 24px;
+    padding-left: 36px;
+    padding-top: 6px;
+    background-position: 4px 2px;
+    font-size: 12px; 
 }
 
 .role, .template, .environment {
-	background-repeat: no-repeat;
-	height: 24px;
-	padding-left: 34px;
-	padding-top: 6px;
-	background-position: 4px 2px !important;
-	font-size: 12px; 
+    background-repeat: no-repeat;
+    height: 24px;
+    padding-left: 34px;
+    padding-top: 6px;
+    background-position: 4px 2px !important;
+    font-size: 12px; 
 }
 
 .role {
-	background: url("#{$imagePath}/global/recipe.png") no-repeat;
+    background: url("#{$imagePath}/global/recipe.png") no-repeat;
 }
 
 .template {
-	background: url("#{$imagePath}/global/template.png") no-repeat;
+    background: url("#{$imagePath}/global/template.png") no-repeat;
 }
 
 .environment {
-	background: url("#{$imagePath}/global/environment.png") no-repeat;
+    background: url("#{$imagePath}/global/environment.png") no-repeat;
 }
 
 .anchorAddi, .anchorRemovei, .anchorUpi, .anchorDowni {
-	color: #fff;
+    color: #fff;
 }
 
 .anchorAdd {
-	border-radius: 50%;
-	height: 32px;
-	width: 32px;
-	margin-bottom: 15px;
+    border-radius: 50%;
+    height: 32px;
+    width: 32px;
+    margin-bottom: 15px;
 }
 
 .anchorRemove {
-	border-radius: 50%;
-	height: 32px;
-	margin-top: 15px;
-	width: 32px;
+    border-radius: 50%;
+    height: 32px;
+    margin-top: 15px;
+    width: 32px;
 }
 
 .anchorUp {
-	border-radius: 50%;
-	height: 32px;
-	width: 32px;
-	margin-bottom: 15px;
+    border-radius: 50%;
+    height: 32px;
+    width: 32px;
+    margin-bottom: 15px;
 }
 
 .anchorDown {
-	border-radius: 50%;
-	height: 32px;
-	margin-top: 15px;
-	width: 32px;
+    border-radius: 50%;
+    height: 32px;
+    margin-top: 15px;
+    width: 32px;
 }
 /*CSS for Chef Component ends*/
 
 /*Global styles for page name in header starts here*/
 .panel-heading {
- 	background: #fcfcfc;
- 	border-bottom-width: 1px;
- 	@include theme-border-color;
- 	height: 30px;
- 	padding: 5px 15px;
+    background: #fcfcfc;
+    border-bottom-width: 1px;
+    @include theme-border-color;
+    height: 30px;
+    padding: 5px 15px;
     position:relative;
     z-index:3;
- }
+}
 
- .panel-title {
- 	font-size: 14px;
- }
- .panel-title a{
- 	outline: none;
- }
- /*Global styles for page name in header ends*/
+.panel-title {
+    font-size: 14px;
+}
+.panel-title a{
+    outline: none;
+}
+/*Global styles for page name in header ends*/
 
- .globalPopup {
+.globalPopup {
     position: fixed;
     top: -70px;
     left: 0;
@@ -466,10 +604,10 @@ option.script {
 }
 
 #globalSuccessMessage {
-	background-color: #b3ddba;
-	border-bottom: 1px solid #d6e9c6;
-	color: #3c763d;
-	/*color: #a94442;*/
+    background-color: #b3ddba;
+    border-bottom: 1px solid #d6e9c6;
+    color: #3c763d;
+    /*color: #a94442;*/
 }
 
 .globalPopup .close {
@@ -487,100 +625,100 @@ option.script {
     font-size: 12px;
 
     .timeStamp {
-	    color: #000;
-	}
+        color: #000;
+    }
 
-	.logMsg {
-	    color: $color-darkBlue;
-	}
+    .logMsg {
+        color: $color-darkBlue;
+    }
 
-	.logErrorMsg {
-	    color: $color-red;
-	}
+    .logErrorMsg {
+        color: $color-red;
+    }
 
-	.rowSpacing {
-     	padding-top: 7px;
-	 }
+    .rowSpacing {
+        padding-top: 7px;
+    }
 
-	 .logInfo {
-	     margin-left: 10px;
-	 }
+    .logInfo {
+        margin-left: 10px;
+    }
 }
 
 /*Can be used globally*/
 .margintop15 {
-	margin-top: 15px;
+    margin-top: 15px;
 }
 
 .marginleft15 {
-	margin-left: 15px;
+    margin-left: 15px;
 }
 
 .no-padding {
-	padding: 0px;
+    padding: 0px;
 }
 
 .marginleft5 {
-	margin-left: 5px;
+    margin-left: 5px;
 }
 
 /* global styles for logs display across workzone ends here*/
 
 /*ui grid css starts here*/
 .ui-grid {
-	font-size: 13px;
-	text-align: center;
-
-	li.ng-binding.ng-scope {
-		white-space: nowrap;
-		text-overflow: ellipsis;
-		overflow: hidden;
-	}
-
-	div.ng-binding.ng-scope {
-		white-space: nowrap;
-		text-overflow: ellipsis;
-		overflow: hidden;
-	}
-	
-	.ui-grid-cell {
-		text-overflow: ellipsis;
-		overflow: initial;
-	}
-
-	ul.ng-scope {
-		padding: 0px;
-		text-align: center;
-	}
-
-	ul li {
-		line-height: 2;
-	}
-
-	.ui-grid-row {
-	    height: auto!important;
-	}
-
-	.ui-grid-pager-panel.ng-scope {
-		background: #ccc;
-	}
-
-	.ui-grid-row > div .ui-grid-cell {
-	    display: table-cell;
-	    float: none;
-	    vertical-align: middle;
-	    height: auto;
-	    padding:6px;
-	    overflow: hidden;
-	}
-
-	.ui-grid-cell-contents {
-	    white-space: pre-wrap;
-	}
-
-	.ui-grid-invisible {
-	    display: none;
-	}
+    font-size: 13px;
+    text-align: center;
+
+    li.ng-binding.ng-scope {
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        overflow: hidden;
+    }
+
+    div.ng-binding.ng-scope {
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        overflow: hidden;
+    }
+
+    .ui-grid-cell {
+        text-overflow: ellipsis;
+        overflow: initial;
+    }
+
+    ul.ng-scope {
+        padding: 0px;
+        text-align: center;
+    }
+
+    ul li {
+        line-height: 2;
+    }
+
+    .ui-grid-row {
+        height: auto!important;
+    }
+
+    .ui-grid-pager-panel.ng-scope {
+        background: #ccc;
+    }
+
+    .ui-grid-row > div .ui-grid-cell {
+        display: table-cell;
+        float: none;
+        vertical-align: middle;
+        height: auto;
+        padding:6px;
+        overflow: hidden;
+    }
+
+    .ui-grid-cell-contents {
+        white-space: pre-wrap;
+    }
+
+    .ui-grid-invisible {
+        display: none;
+    }
     .ui-grid-pager-control{
         .ui-grid-pager-max-pages-number
         {
@@ -596,221 +734,242 @@ option.script {
 /*pagination Styling*/
 
 .paginationStyle {
-	bottom:0px;
-	float:left;	
+    bottom:0px;
+    float:left;	
 }
 
 .pagination {
-	margin: 0px;
+    margin: 0px;
 }
 
 .message-warning{
-	i{
-		color: #d58512;
-	}
+    i{
+        color: #d58512;
+    }
 }
 
 #sidebar-wrapper {
-	padding: 21px 7px 0 7px;
-	right: -279px ;
-	width: 273px;
-	background: #F5F5F5;
-	position: fixed;
-	height: auto;
-	min-height: 50%;
-	z-index: 10000;
-	transition: all .4s ease 0s;
-	box-shadow: 0px 3px 3px 5px #888888;
+    padding: 10px;
+    right: -279px ;
+    width: 273px;
+    background: #fff none repeat scroll 0 0;
+    position: fixed;
+    height: auto;
+    min-height: 50%;
+    z-index: 10000;
+    border: 1px solid #40baf1;
+    transition: all 0.4s ease 0s;
+    box-shadow: 0 5px 5px #afafaf;
+    .checkbox input[type="checkbox"], .checkbox-inline input[type="checkbox"], .radio input[type="radio"], .radio-inline input[type="radio"] {
+        margin-top: 0;
+    }
+    .filter-type{
+        padding:10px 0;
+    }
+    .repo-job-details-wrapper-inner{
+        color: #286090;
+        font-size: 17px;
+    }
+    .form-group{
+        padding: 0;
+        label{
+            font-size: 14px; 
+            font-weight: normal;
+        }
+    }
+    .marginbottom5{
+        padding:0;
+    }
 }
 .show-wrapper{
-	right:5px !important;
+    right:5px !important;
 }
 .repo-job-details-wrapper {
-	border: 1px solid #dddddd;
-	margin: 0 2px;
-	padding: 0.35em 0.625em 0.75em;
+    border: 1px solid #dddddd;
+    margin: 0 2px;
+    padding: 0.35em 0.625em 0.75em;
 }
 .repo-job-details-wrapper-inner {
-	border: 0 none;
-	padding: 0;
-	width: auto;
-	margin-bottom: 0;
-	font-size: 15px;
-	color: #666;
+    border: 0 none;
+    padding: 0;
+    width: auto;
+    margin-bottom: 0;
+    font-size: 15px;
+    color: #666;
 }
 .pointer-cursor{
-	cursor: pointer;
+    cursor: pointer;
 }
 
 
 ///////box------
 .box {
-	position: relative;
-	border-radius: 3px;
-	background: #ffffff;
-	border-top: 3px solid #d2d6de;
-	margin-bottom: 20px;
-	width: 100%;
-	box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1)
+    position: relative;
+    border-radius: 3px;
+    background: #ffffff;
+    border-top: 3px solid #d2d6de;
+    margin-bottom: 20px;
+    width: 100%;
+    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1)
 }
 
 .box.box-primary {
-	border-top-color: #3c8dbc
+    border-top-color: #3c8dbc
 }
 
 .box.box-info {
-	border-top-color: #00c0ef
+    border-top-color: #00c0ef
 }
 
 .box.box-danger {
-	border-top-color: #dd4b39
+    border-top-color: #dd4b39
 }
 
 .box.box-warning {
-	border-top-color: #f39c12
+    border-top-color: #f39c12
 }
 
 .box.box-success {
-	border-top-color: #00a65a
+    border-top-color: #00a65a
 }
 
 .box.box-default {
-	border-top-color: #d2d6de
+    border-top-color: #d2d6de
 }
 
 .box.collapsed-box .box-body,
 .box.collapsed-box .box-footer {
-	display: none
+    display: none
 }
 
 .box .nav-stacked>li {
-	border-bottom: 1px solid #f4f4f4;
-	margin: 0
+    border-bottom: 1px solid #f4f4f4;
+    margin: 0
 }
 
 .box .nav-stacked>li:last-of-type {
-	border-bottom: none
+    border-bottom: none
 }
 
 .box.height-control .box-body {
-	max-height: 300px;
-	overflow: auto
+    max-height: 300px;
+    overflow: auto
 }
 
 .box .border-right {
-	border-right: 1px solid #f4f4f4
+    border-right: 1px solid #f4f4f4
 }
 
 .box .border-left {
-	border-left: 1px solid #f4f4f4
+    border-left: 1px solid #f4f4f4
 }
 
 .box.box-solid {
-	border-top: 0
+    border-top: 0
 }
 
 .box.box-solid>.box-header .btn.btn-default {
-	background: transparent
+    background: transparent
 }
 
 .box.box-solid>.box-header .btn:hover,
 .box.box-solid>.box-header a:hover {
-	background: rgba(0, 0, 0, 0.1)
+    background: rgba(0, 0, 0, 0.1)
 }
 
 .box.box-solid.box-default {
-	border: 1px solid #d2d6de
+    border: 1px solid #d2d6de
 }
 
 .box.box-solid.box-default>.box-header {
-	color: #444;
-	background: #d2d6de;
-	background-color: #d2d6de
+    color: #444;
+    background: #d2d6de;
+    background-color: #d2d6de
 }
 
 .box.box-solid.box-default>.box-header a,
 .box.box-solid.box-default>.box-header .btn {
-	color: #444
+    color: #444
 }
 
 .box.box-solid.box-primary {
-	border: 1px solid #3c8dbc
+    border: 1px solid #3c8dbc
 }
 
 .box.box-solid.box-primary>.box-header {
-	color: #fff;
-	background: #3c8dbc;
-	background-color: #3c8dbc
+    color: #fff;
+    background: #3c8dbc;
+    background-color: #3c8dbc
 }
 
 .box.box-solid.box-primary>.box-header a,
 .box.box-solid.box-primary>.box-header .btn {
-	color: #fff
+    color: #fff
 }
 
 .box.box-solid.box-info {
-	border: 1px solid #00c0ef
+    border: 1px solid #00c0ef
 }
 
 .box.box-solid.box-info>.box-header {
-	color: #fff;
-	background: #00c0ef;
-	background-color: #00c0ef
+    color: #fff;
+    background: #00c0ef;
+    background-color: #00c0ef
 }
 
 .box.box-solid.box-info>.box-header a,
 .box.box-solid.box-info>.box-header .btn {
-	color: #fff
+    color: #fff
 }
 
 .box.box-solid.box-danger {
-	border: 1px solid #dd4b39
+    border: 1px solid #dd4b39
 }
 
 .box.box-solid.box-danger>.box-header {
-	color: #fff;
-	background: #dd4b39;
-	background-color: #dd4b39
+    color: #fff;
+    background: #dd4b39;
+    background-color: #dd4b39
 }
 
 .box.box-solid.box-danger>.box-header a,
 .box.box-solid.box-danger>.box-header .btn {
-	color: #fff
+    color: #fff
 }
 
 .box.box-solid.box-warning {
-	border: 1px solid #f39c12
+    border: 1px solid #f39c12
 }
 
 .box.box-solid.box-warning>.box-header {
-	color: #fff;
-	background: #f39c12;
-	background-color: #f39c12
+    color: #fff;
+    background: #f39c12;
+    background-color: #f39c12
 }
 
 .box.box-solid.box-warning>.box-header a,
 .box.box-solid.box-warning>.box-header .btn {
-	color: #fff
+    color: #fff
 }
 
 .box.box-solid.box-success {
-	border: 1px solid #00a65a
+    border: 1px solid #00a65a
 }
 
 .box.box-solid.box-success>.box-header {
-	color: #fff;
-	background: #00a65a;
-	background-color: #00a65a
+    color: #fff;
+    background: #00a65a;
+    background-color: #00a65a
 }
 
 .box.box-solid.box-success>.box-header a,
 .box.box-solid.box-success>.box-header .btn {
-	color: #fff
+    color: #fff
 }
 
 .box.box-solid>.box-header>.box-tools .btn {
-	border: 0;
-	box-shadow: none
+    border: 0;
+    box-shadow: none
 }
 .box-header:before,
 .box-body:before,
@@ -818,180 +977,192 @@ option.script {
 .box-header:after,
 .box-body:after,
 .box-footer:after {
-	content: " ";
-	display: table
+    content: " ";
+    display: table
 }
 
 .box-header:after,
 .box-body:after,
 .box-footer:after {
-	clear: both
+    clear: both
 }
 
 .box-header {
-	color: #444;
-	display: block;
-	padding: 10px;
-	position: relative
+    color: #444;
+    display: block;
+    padding: 10px;
+    position: relative
 }
 
 .box-header.with-border {
-	border-bottom: 1px solid #f4f4f4
+    border-bottom: 1px solid #f4f4f4
 }
 
 .collapsed-box .box-header.with-border {
-	border-bottom: none
+    border-bottom: none
 }
 
 .box-header>.fa,
 .box-header>.glyphicon,
 .box-header>.ion,
 .box-header .box-title {
-	display: inline-block;
-	font-size: 18px;
-	margin: 0;
-	line-height: 1
+    display: inline-block;
+    font-size: 18px;
+    margin: 0;
+    line-height: 1
 }
 
 .box-header>.fa,
 .box-header>.glyphicon,
 .box-header>.ion {
-	margin-right: 5px
+    margin-right: 5px
 }
 
 .box-header>.box-tools {
-	position: absolute;
-	right: 10px;
-	top: 5px
+    position: absolute;
+    right: 10px;
+    top: 5px
 }
 
 .box-header>.box-tools [data-toggle="tooltip"] {
-	position: relative
+    position: relative
 }
 
 .box-header>.box-tools.pull-right .dropdown-menu {
-	right: 0;
-	left: auto
+    right: 0;
+    left: auto
 }
 
 .btn-box-tool {
-	padding: 5px;
-	font-size: 12px;
-	background: transparent;
-	color: #97a0b3
+    padding: 5px;
+    font-size: 12px;
+    background: transparent;
+    color: #97a0b3
 }
 
 .open .btn-box-tool,
 .btn-box-tool:hover {
-	color: #606c84
+    color: #606c84
 }
 
 .btn-box-tool.btn:active {
-	box-shadow: none
+    box-shadow: none
 }
 
 .box-body {
-	border-top-left-radius: 0;
-	border-top-right-radius: 0;
-	border-bottom-right-radius: 3px;
-	border-bottom-left-radius: 3px;
-	padding: 10px;
-	background: #FDFDFD;
+    border-top-left-radius: 0;
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 3px;
+    border-bottom-left-radius: 3px;
+    padding: 10px;
+    background: #FDFDFD;
 }
 
 .no-header .box-body {
-	border-top-right-radius: 3px;
-	border-top-left-radius: 3px
+    border-top-right-radius: 3px;
+    border-top-left-radius: 3px
 }
 
 .box-body>.table {
-	margin-bottom: 0
+    margin-bottom: 0
 }
 
 .box-body .fc {
-	margin-top: 5px
+    margin-top: 5px
 }
 
 .box-body .full-width-chart {
-	margin: -19px
+    margin: -19px
 }
 
 .box-body.no-padding .full-width-chart {
-	margin: -9px
+    margin: -9px
 }
 
 .box-body .box-pane {
-	border-top-left-radius: 0;
-	border-top-right-radius: 0;
-	border-bottom-right-radius: 0;
-	border-bottom-left-radius: 3px
+    border-top-left-radius: 0;
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+    border-bottom-left-radius: 3px
 }
 
 .box-body .box-pane-right {
-	border-top-left-radius: 0;
-	border-top-right-radius: 0;
-	border-bottom-right-radius: 3px;
-	border-bottom-left-radius: 0
+    border-top-left-radius: 0;
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 3px;
+    border-bottom-left-radius: 0
 }
 
 .box-footer {
-	border-top-left-radius: 0;
-	border-top-right-radius: 0;
-	border-bottom-right-radius: 3px;
-	border-bottom-left-radius: 3px;
-	border-top: 1px solid #f4f4f4;
-	padding: 10px;
-	background-color: #fff
+    border-top-left-radius: 0;
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 3px;
+    border-bottom-left-radius: 3px;
+    border-top: 1px solid #f4f4f4;
+    padding: 10px;
+    background-color: #fff
 }
 .bg-yellow{
-	background-color: #E49C25 !important;
+    background-color: #E49C25 !important;
 }
 .ui-grid-menu-button{
-	height: 28px !important;
-	background-color: #5bc0de !important;
-	border-color: #46b8da !important;
-	display: inline-block;
-	margin-bottom: 0;
-	font-size: 14px;
-	font-weight: 400;
-	line-height: 1.42857143;
-	text-align: center;
-	white-space: nowrap;
-	vertical-align: middle;
-	-ms-touch-action: manipulation;
-	touch-action: manipulation;
-	cursor: pointer;
-	-webkit-user-select: none;
-	-moz-user-select: none;
-	-ms-user-select: none;
-	user-select: none;
-	background-image: none;
-	border: 1px solid transparent;
-	border-radius: 4px 0 0 4px;
+    height: 28px !important;
+    background-color: #5bc0de !important;
+    border-color: #46b8da !important;
+    display: inline-block;
+    margin-bottom: 0;
+    font-size: 14px;
+    font-weight: 400;
+    line-height: 1.42857143;
+    text-align: center;
+    white-space: nowrap;
+    vertical-align: middle;
+    -ms-touch-action: manipulation;
+    touch-action: manipulation;
+    cursor: pointer;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+    background-image: none;
+    border: 1px solid transparent;
+    border-radius: 4px 0 0 4px;
 }
 #well{
-	min-height: 35px;
-	padding: 9px;
-	margin: 11px 0 0 0;
-	background-color: #FDFDFD;
-	border-bottom: 1px solid #e3e3e3;
-	border-top: none !important;
-	border-left: none !important;
-	border-right: none !important;
-	border-radius: none !important;
-	-webkit-box-shadow: none !important;
-	box-shadow: none !important;
-	span{
-		margin-left: 13px;
-	}
+    min-height:48px;
+    padding: 9px;
+    margin: 11px 0 0 0;
+    background-color: #FDFDFD;
+    border-bottom: 1px solid #e3e3e3;
+    border-top: none !important;
+    border-left: none !important;
+    border-right: none !important;
+    border-radius: none !important;
+    -webkit-box-shadow: none !important;
+    box-shadow: none !important;
+    .filter-wrapper{
+        text-align: right; padding:5px 0 0 0;
+        span{
+            margin: 0 1px 0 0;
+            &:last-child {
+                margin: 0;
+            }
+            .label {
+                padding: 5px 10px;
+                font-size: 85%;
+                background: #a7a7a7;
+                border: 1px solid #a7a7a7;
+            }
+        }
+    }
 }
 
 .onbody-loading{
-	position: absolute;
-	top: 50%;
-	left: 50%;
-	z-index: 99999;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    z-index: 99999;
 }
 .loading-body{
-	opacity: 0.4;
+    opacity: 0.4;
 }
\ No newline at end of file
diff --git a/client/cat3/src/partials/globals/breadcrumb/breadcrumbService.js b/client/cat3/src/partials/globals/breadcrumb/breadcrumbService.js
index 8ef917f2c..33f49d010 100644
--- a/client/cat3/src/partials/globals/breadcrumb/breadcrumbService.js
+++ b/client/cat3/src/partials/globals/breadcrumb/breadcrumbService.js
@@ -49,5 +49,13 @@
 		$rootScope.$on('HIDE_BREADCRUMB',function(){
 			$rootScope.isBreadCrumbAvailable=false;
 		});
+		$rootScope.showTree=false;
+		$rootScope.showTreeOverlay = function () {
+	        $rootScope.showTree = true;
+	    };
+
+	    $rootScope.hideTreeOverlay = function () {
+	        $rootScope.showTree = false;
+	    };
 	}]);
 })(angular);
\ No newline at end of file
diff --git a/client/cat3/src/partials/sections/dashboard/analytics/analytics.html b/client/cat3/src/partials/sections/dashboard/analytics/analytics.html
index 905edc8be..d9e4627d7 100644
--- a/client/cat3/src/partials/sections/dashboard/analytics/analytics.html
+++ b/client/cat3/src/partials/sections/dashboard/analytics/analytics.html
@@ -7,9 +7,9 @@
 
 	<div id="sidebar-wrapper" ng-class="{'show-wrapper':isOpenSidebar === true}">
 		<form>
-			<fieldset class="repo-job-details-wrapper">
-				<legend class="repo-job-details-wrapper-inner">Filter:</legend>
-				<div class="col-lg-12 col-md-12 form-group" ng-show="stateItems.filterView.viewBy">
+			<div>
+                <div class="repo-job-details-wrapper-inner marginbottom10"  >Filter:</div>
+                <div class="col-lg-12 col-md-12 form-group filter-type" ng-show="stateItems.filterView.viewBy">
 					<label class="radio-inline">
 						<input type="radio" ng-model="analytic.viewByFilter" name="viewBy" value="orgView">Org
 					</label>
@@ -17,9 +17,9 @@
 						<input type="radio" ng-model="analytic.viewByFilter" name="viewBy" value="ProviderView">Provider
 					</label>
 				</div>
-				<div class="col-lg-12 col-md-12 form-group" ng-show="stateItems.filterView.org">
+                <div class="col-lg-12 col-md-12 form-group" ng-show="stateItems.filterView.org">
 					<label for="">Organization</label>
-					<select  ng-model="organNewEnt.org" class="chooseProjectExisting width-100 form-control">
+					<select  ng-model="organNewEnt.org" class="chooseProjectExisting width-100 form-control"  ng-change="getProviders(organObject[organNewEnt.org].rowid)">
 						<option value="">Select</option>
 						<option ng-repeat="org in organObject"  value="{{organObject.indexOf(org)}}" >{{org.name}}</option>
 					</select>
@@ -45,7 +45,7 @@
 						<option ng-repeat="env in organObject[organNewEnt.org].environments" value="{{organObject[organNewEnt.org].environments.indexOf(env)}}" >{{env.name}}</option>
 					</select>
 				</div>
-				<div class="col-lg-12 col-md-12 form-group" ng-show="stateItems.filterView.provi || analytic.ViewproviFilter">
+                <div class="col-lg-12 col-md-12 form-group" ng-show="stateItems.filterView.provi || analytic.ViewproviFilter">
 					<label for="">Provider</label>
 					<select class="form-control select2 select2-hidden-accessible" id="selectProvider" ng-model="organNewEnt.provider" >
                         <option value=''>Select</option>
@@ -86,17 +86,20 @@
 							</div>
 							<div class="panel-body bp-panel-body list-resources">
 								<ul class="list-group">
-									<li class="list-group-item cursor" ng-repeat="resource in resourceList | filter:searchText.name | filter:{platformId: filters.platformId}" ng-class="{'selected':selectedResources.indexOf(resource._id)>-1}" ng-click="toggleResourceSelection(resource._id);">{{resource.platformId}}</li>
+									<li class="list-group-item cursor" ng-repeat="resource in resourceList | filter:searchText.name | filter:{platformId: filters.platformId}" ng-class="{'selected':selectedResources.indexOf(resource._id)>-1}" ng-click="toggleResourceSelection(resource._id,resource.platformId);">{{resource.platformId}}</li>
 								</ul>
 							</div>
+							<span class="error red" ng-show="selectedResources.length === 10">
+								Maximum 10 resources allowed.
+							</span>
 						</div>
 					</div>
 				</div>
-				<div class="col-lg-12 col-md-12 marginbottom5">
+                <div class="col-lg-12 col-md-12 marginbottom5">
 					<button type="button" class="btn btn-primary" ng-click="applyFilter(true,filterNewEnt.period);isOpenSidebar=false;"><i class="fa fa-filter fa-2 white" aria-hidden="true"></i>&nbsp;Apply</button>
 					<button type="button" class="btn btn-default" ng-click="applyFilter(false,filterNewEnt.period);isOpenSidebar=false;"><i class="fa fa-times fa-2" aria-hidden="true"></i>&nbsp;Clear</button>
 				</div>
-			</fieldset>
+			</div>
 		</form>
 		<br/>
 	</div>
@@ -105,7 +108,7 @@
 		<div id='rightPanel' class='container-fluid'>
 			<ul class="nav nav-tabs" >
 				<li ng-class="{'active':analytic.tabShowChat === true}"><a ng-click="analytic.tabShow(true,false)"  ><i class="fa fa-area-chart fa-2" aria-hidden="true"></i> Dashboard</a></li>
-				<li ng-show="!stateItems.filterView.report" ng-class="{'active':analytic.tabShowReport === true}"><a ng-click="analytic.tabShow(false,true)" ><i class="fa fa-file-text fa-2" aria-hidden="true"></i> Reports</a></li>
+				<li ng-class="{'active':analytic.tabShowReport === true}"><a ng-click="analytic.tabShow(false,true)" ><i class="fa fa-file-text fa-2" aria-hidden="true"></i> Reports</a></li>
 				<li class="form-group pull-right filter-btn" >
 					<button type="button" class="btn btn-xs cat-btn-update ng-scope pull-right margin-left6" ng-click="isOpenSidebar = !isOpenSidebar">
 						<i class="fa fa-filter fa-2 white" aria-hidden="true"></i>&nbsp;Filter
@@ -113,19 +116,16 @@
 				</li>
 			</ul>
 			<div class="well" id="well">
-				<div class="btn-group" role="group" aria-label="...">
-					<button type="button" class="btn btn-sm btn-primary cat-btn-update" ng-class="{'active':filterNewEnt.period === 'day'}"  ng-click="analytic.applyFilter(true,'day')">DAY</button>
-					<button type="button" class="btn btn-sm btn-primary cat-btn-update" ng-class=" {'active':filterNewEnt.period === 'week'}"  ng-click="analytic.applyFilter(true,'week')">WEEK</button>
-					<button type="button" class="btn btn-sm btn-primary cat-btn-update" ng-class=" {'active':filterNewEnt.period === 'month'}" ng-click="analytic.applyFilter(true,'month')">MONTH</button>
-					<button type="button" class="btn btn-sm btn-primary cat-btn-update" ng-class=" {'active':filterNewEnt.period === 'year'}"  ng-click="analytic.applyFilter(true,'year')">YEAR</button>
-					<select ng-show="stateItems.filterView.splitUpType && splitUpCosts.length > 0" class="form-control select2 select2-hidden-accessible" style="width: auto;height: 31px;" ng-model="analytic.splitUp"
-							ng-options="sp.id as sp.val for sp in splitUpCosts" >
-					</select>
+				<div class="col-lg-5 col-md-5 col-sm-12 btn-group" role="group" aria-label="...">
+					<button type="button" class="btn btn-sm btn-primary cat-btn-update" ng-class="{'active':filterNewEnt.period === 'day'}"  ng-click="applyFilter(true,'day')">DAY</button>
+					<button type="button" class="btn btn-sm btn-primary cat-btn-update" ng-class=" {'active':filterNewEnt.period === 'week'}"  ng-click="applyFilter(true,'week')">WEEK</button>
+					<button type="button" class="btn btn-sm btn-primary cat-btn-update" ng-class=" {'active':filterNewEnt.period === 'month'}" ng-click="applyFilter(true,'month')">MONTH</button>
+					<button type="button" class="btn btn-sm btn-primary cat-btn-update" disabled="disabled" ng-class=" {'active':filterNewEnt.period === 'year'}"  ng-click="applyFilter(true,'year')">YEAR</button>
 				</div>
-				<div class="col-lg-7 col-md-7 col-sm-12 pull-right" >
-					<span ng-repeat="filt in filterNewEnt"  ng-if="filt !== '' && filt.title">
+                <div class="col-lg-7 col-md-7 col-sm-12 filter-wrapper">
+                    <span  ng-repeat="filt in filterNewEnt"  ng-if="filt !== '' && filt.title">
 						<!--data-toggle="tooltip" onmouseenter="$(this).tooltip('show')"-->
-						<span class="label label-success "  title="{{filt.title}}">{{filt.title}} :{{filt.name}}
+						<span class="label label-success "  title="{{filt.title}}">{{filt.title}}: {{filt.name}}
 						</span>
 					</span>
 				</div>
diff --git a/client/cat3/src/partials/sections/dashboard/analytics/analytics.js b/client/cat3/src/partials/sections/dashboard/analytics/analytics.js
index 92d6ff7d0..92af46e0b 100644
--- a/client/cat3/src/partials/sections/dashboard/analytics/analytics.js
+++ b/client/cat3/src/partials/sections/dashboard/analytics/analytics.js
@@ -7,7 +7,7 @@
 				url: "cost/",
 				templateUrl: "src/partials/sections/dashboard/analytics/view/cost.html",
 				controller: "costCtrl as cost",
-				params:{filterView:{viewBy:true,splitUpType:true,org:true}},
+				params:{filterView:{cost:true,viewBy:true,splitUpType:true,org:true}},
 				resolve: {
 					auth: ["$q", function ($q) {
 						var deferred = $q.defer();
@@ -24,8 +24,8 @@
 			}).state('dashboard.analytics.capacity', {
 				url: "capacity/",
 				templateUrl: "src/partials/sections/dashboard/analytics/view/capacity.html",
-				controller: "capacityCtrl as capacity",
-				params:{filterView:{}},
+				controller: "capacityCtrl as capaCtr",
+				params:{filterView:{cost:true,viewBy:true,splitUpType:true,org:true}},
 				resolve: {
 					auth: ["$q", function ($q) {
 						var deferred = $q.defer();
@@ -43,7 +43,7 @@
 				url: "usage/",
 				templateUrl: "src/partials/sections/dashboard/analytics/view/usage.html",
 				controller: "usageCtrl as usage",
-				params:{filterView:{org:true,provi:true,instanceType:true,resources:true,report:true}},
+				params:{filterView:{usage:true,org:true,provi:true,instanceType:true,resources:true}},
 				resolve: {
 					auth: ["$q", function ($q) {
 						var deferred = $q.defer();
@@ -64,7 +64,6 @@
 		var splitUp=null;
 		analytic.tabShowChat=true;
 		analytic.tabShowReport=false;
-		$scope.showTree = true;
 		$rootScope.isOpenSidebar = false;
 		$rootScope.dashboardChild = 'analytics';
 		$rootScope.stateItems = $state.params;
@@ -100,21 +99,15 @@
 		//get organisation
 		genericServices.getTreeNew().then(function (orgs) {
 			$rootScope.organObject = orgs;
+			$scope.getProviders(orgs[0].rowid)
 		});
 		if (!$rootScope.stateParams.view) {
 			$state.go('dashboard.analytics.cost');
 		}
-		analytic.hideTreeOverlay =function (){
-			genericServices.hideTreeOverlay();
-		};
-		analytic.showTreeOverlay =function (){
-			genericServices.showTreeOverlay();
-		};
 		analytic.tabShow=function(chat,report){
 			analytic.tabShowChat=chat;
 			analytic.tabShowReport=report;
 		};
-		analytic.hideTreeOverlay();
 		$scope.getAllRegionsList = function() {
             workzoneServices.getAllRegionsList().then(function(response) {
                 $scope.allRegions = response.data;
@@ -122,14 +115,19 @@
                 toastr.error(error);
             });
         };
-        $scope.getProviders = function() {
-            workzoneServices.getProviders().then(function(response) {
-				$rootScope.providers=response.data;
-                $scope.providers = response.data;
-                $scope.filter = [];
-                $scope.filter.providerId = response.data[0]._id;
-            }, function(error) {
-                toastr.error(error);
+        $scope.getProviders = function(id) {
+			var param = {
+				 url: '/aws/providers/org/'+id
+			};
+			genericServices.promiseGet(param).then(function (result) {
+				$rootScope.providers=[];
+				if(result && result.length >0) {
+					$rootScope.providers = result;
+					$scope.filter = [];
+					$scope.filter.providerId = result[0]._id;
+				} else{
+					$rootScope.organNewEnt.provider='';
+				}
             });
         };
         $scope.getProviderRegions = function() {
@@ -161,7 +159,6 @@
         };
 
         $scope.getAllRegionsList();
-        $scope.getProviders();
 		$scope.fnProviderChange = function() {
             $scope.filter.regionId = '';
             $scope.filter.vpcId = '';
@@ -202,6 +199,7 @@
 						$scope.resourceList = response.data.data;
 						$scope.selectedResources.push(response.data.data[0]._id);
 						$rootScope.filterNewEnt.resources=$scope.selectedResources;
+						$rootScope.filterNewEnt.platformId[response.data.data[0]._id]=response.data.data[0].platformId;
 					} else {
 						$scope.resourceList = [];
 					}
@@ -210,25 +208,27 @@
 	            });
 	        }
         };
-		$scope.$on('INI_usage', function (event, id) {
+		$rootScope.$on('INI_usage', function (event, id) {
 			$scope.getResourse(id);
 		});
-        $scope.toggleResourceSelection = function(resourceId) {
-            // var idx = $scope.selectedResources.indexOf(resourceId);
-            // if(idx > -1) {
-        		// $scope.selectedResources.splice(idx, 1);
-    		// } else {
-    		// 	if($scope.selectedResources.length === 5){
-    		// 		toastr.error('Maximum 5 resources allowed.');
-    		// 	}else{
-    		// 		$scope.selectedResources.push(resourceId);
-    		// 	}
-    		// }
-			if($scope.selectedResources === resourceId){
-				$scope.selectedResources='';
-			} else{
-				$scope.selectedResources=resourceId;
-			}
+        $scope.toggleResourceSelection = function(resourceId,platformId) {
+            var idx = $scope.selectedResources.indexOf(resourceId);
+            if(idx > -1) {
+        		$scope.selectedResources.splice(idx, 1);
+				
+    		} else {
+    			if($scope.selectedResources.length === 10){
+    				///toastr.error('Maximum 5 resources allowed.');
+    			}else{
+					$rootScope.filterNewEnt.platformId[resourceId]=platformId;
+    				$scope.selectedResources.push(resourceId);
+    			}
+    		}
+            // if($scope.selectedResources === resourceId){
+				// $scope.selectedResources='';
+            // } else{
+				// $scope.selectedResources=resourceId;
+            // }
 
 			$rootScope.filterNewEnt.resources=$scope.selectedResources;
 		};
diff --git a/client/cat3/src/partials/sections/dashboard/analytics/analytics.scss b/client/cat3/src/partials/sections/dashboard/analytics/analytics.scss
index 6eeb3b83a..cf8c2d7cf 100644
--- a/client/cat3/src/partials/sections/dashboard/analytics/analytics.scss
+++ b/client/cat3/src/partials/sections/dashboard/analytics/analytics.scss
@@ -80,6 +80,35 @@
     width: 11.2%;
   }
 }
+#analyticsPage .nvd3 .nv-groups path.nv-line {
+  stroke-width: 3px !important;
+}
+.usage{
+    .top-stats{
+        text-align: right;
+    }
+}
+
+.top-stats{
+    margin: 0px 0px 15px;
+    .box-title{
+        font-size: 16px;
+        .red{
+            font-size: 22px;
+        }
+    }
+    .badge{
+        margin-right: 2px; 
+        background: #40baf1; 
+        padding: 3px 10px;
+        margin-top: -5px;
+    }
+    .select2{
+        width: auto;
+        height: 31px;
+        display: table-cell;
+    }
+}
 
 #analyticsPage {
   background: #fff;
@@ -89,10 +118,9 @@
   }
 
   .panelRight {
-    width: calc(100% - 258px);
+    width: 100%;
     background: linear-gradient(to right, #ffffff 99%, #ffffff 100%) repeat scroll 0 0 rgba(0, 0, 0, 0);
     padding-right: 10px;
-    float: right;
     height: 571px;
     overflow-y: auto;
   }
@@ -188,7 +216,7 @@
   #sidebar-wrapper {
     padding: 10px 7px 0 7px;
     min-height: 80%;
-    top: 116px;
+    top: 121px;
 
     .repo-job-details-wrapper {
       padding: 0.05em 0.625em 0.25em;
@@ -268,4 +296,16 @@
   .selected {
     background: #E49C25;
   }
+}
+.nv-axislabel{
+  font-size: 14px !important;
+}
+.nvd3 text {
+  font: normal 10px Arial;
+}
+.font-size-15{
+  font-size: 15px !important;
+}
+.marginbottom10{
+  margin-bottom: 10px !important;
 }
\ No newline at end of file
diff --git a/client/cat3/src/partials/sections/dashboard/analytics/analyticsServices.js b/client/cat3/src/partials/sections/dashboard/analytics/analyticsServices.js
index cb52c0c98..6d0daf71c 100644
--- a/client/cat3/src/partials/sections/dashboard/analytics/analyticsServices.js
+++ b/client/cat3/src/partials/sections/dashboard/analytics/analyticsServices.js
@@ -1,7 +1,7 @@
 (function (angular) {
     "use strict";
     angular.module('apis.analytics',[])
-        .factory('analyticsServices',['$rootScope', function ($rootScope) {
+        .factory('analyticsServices',['$rootScope','$state', function ($rootScope,$state) {
             return {
                 initFilter:function(){
                     $rootScope.organNewEnt=[];
@@ -9,6 +9,7 @@
                     $rootScope.organNewEnt.org = '0';
                     $rootScope.filterNewEnt.period='month';
                     $rootScope.splitUpCosts=[];
+                    $rootScope.filterNewEnt.platformId=[]
                 },
                 applyFilter : function(filterApp,period){
                     if($rootScope.organObject) {
@@ -58,6 +59,11 @@
                             }
                         } else {
                             $rootScope.organNewEnt = {}
+                            if($state.current.name === "dashboard.analytics.usage"){
+                                $rootScope.organNewEnt.provider='0';
+                                $rootScope.organNewEnt.instanceType='Unassigned';
+                                $rootScope.$emit('INI_usage', 'Unassigned');
+                            }
                             $rootScope.organNewEnt.org = or;
                         }
                     }
diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityCtrl.js
index db0734e82..1d6737cff 100644
--- a/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityCtrl.js
@@ -1,196 +1,302 @@
 (function (angular) {
     "use strict";
     angular.module('dashboard.analytics')
-        .controller('capacityCtrl', ['$scope', '$rootScope', '$state','analyticsServices', 'genericServices', function ($scope,$rootScope,$state,analyticsServices,genSevs){
-        $rootScope.stateItems = $state.params;
-        $rootScope.organNewEnt=[];
-        $rootScope.organNewEnt.org = '0';
-        $rootScope.organNewEnt.buss='0';
-        $rootScope.organNewEnt.proj='0';
-            var capacityObj =this;
-            capacityObj.pieChat={
-                option:{
-                    chart: {
-                        type: 'pieChart',
-                        margin: {
-                            top: 20,
-                            right: 0,
-                            bottom: 60,
-                            left:0
-                        },
-                        height:300,
-                        x: function(d){return d.key;},
-                        y: function(d){return d.y;},
-                        showLabels: false,
-                        showValues: true,
-                        labelThreshold: 0.01,
-                        labelSunbeamLayout: true,
-                        legend: {
+        .controller('capacityCtrl', ['$scope', '$rootScope', '$state','analyticsServices', 'genericServices','$timeout', function ($scope,$rootScope,$state,analyticsServices,genSevs,$timeout){
+            $rootScope.stateItems = $state.params;
+            //analyticsServices.initFilter();
+            var capaCtr =this;
+            capaCtr.chartData=[];
+            capaCtr.splitUp=null;
+            capaCtr.pieChat={
+                option:{},
+                totalCoust:'',
+                data: []
+            };
+            capaCtr.barChat={
+                option:{},
+                data: []
+            };
+            capaCtr.capaGridOptions={
+                columnDefs:[],
+                data:[]
+            };
+            capaCtr.createChart = function() {
+                capaCtr.pieChat = {
+                    option: {
+                        chart: {
+                            type: 'pieChart',
+                            margin: {
+                                top: 20,
+                                right: 0,
+                                bottom: 60,
+                                left: 0
+                            },
+                            height: 300,
+                            x: function (d) {
+                                return d.key;
+                            },
+                            y: function (d) {
+                                return d.value;
+                            },
+                            showLabels: false,
+                            labelType: "value",
+                            labelThreshold: 0.01,
+                            labelSunbeamLayout: true,
+                            legend: {}
+                        }
+                    },
+                    totalCoust: '',
+                    data: []
+                };
 
+                capaCtr.barChat = {
+                    option: {
+                        chart: {
+                            type: 'multiBarChart',
+                            height: 300,
+                            margin: {
+                                top: 20,
+                                right: 20,
+                                bottom: 60,
+                                left: 60
+                            },
+                            duration:1000,
+                            stacked: true,
+                            x: function (d) {
+                                return d.label;
+                            },
+                            y: function (d) {
+                                return d.value;
+                            },
+                            showControls: true,
+                            showValues: true,
+                            xAxis: {
+                                axisLabel: 'Aggregate',
+                                showMaxMin: false,
+                                staggerLabels:false
+                            },
+                            yAxis: {
+                                axisLabel: 'Cost in $',
+                                tickFormat: function (d) {
+                                    return d3.format(',.2f')(d);
+                                }
+                            }
                         }
+                    },
+                    data: []
+
+                };
+
+                capaCtr.capaGridOptions = {
+                    enableGridMenu: true,
+                    enableSelectAll: true,
+                    exporterMenuPdf: false,
+                    exporterCsvFilename: 'costFile.csv',
+                    exporterCsvLinkElement: angular.element(document.querySelectorAll(".custom-csv-link-location")),
+                    onRegisterApi: function (gridApi) {
+                        $scope.gridApi = gridApi;
                     }
-                },
-                totalCoust:'',
-                data:[]
+                };
+
             };
+            capaCtr.getCapacityData=function(fltObj){
+                var param = {
+                    // url: 'src/partials/sections/dashboard/analytics/data/cost.json?org'
+                    url:''
+                };
+                if(fltObj && fltObj.org){
+                    var entityId=null;
+                    if(fltObj.provider){
+                        entityId=fltObj.provider.id;
+                    } else {
+                        entityId=fltObj.org.id;
+                    }
+                    //param.url='http://d4d.rlcatalyst.com/analytics/cost/aggregate?parentEntityId=46d1da9a-d927-41dc-8e9e-7e926d927537&entityId=57f49acdbc45e71f11491f8c&toTimeStamp=Wed%20Oct%2005%202016%2016:03:08%20GMT+0530%20(IST)&period=month';
+                    param.url='/analytics/capacity?parentEntityId='+fltObj.org.id+'&entityId='+entityId+'&toTimeStamp='+new Date()+'&period='+fltObj.period;
+                }
 
-            capacityObj.barChat ={
-                option: {
+                genSevs.promiseGet(param).then(function (result) {
+                    capaCtr.chartData=result;
+                    $rootScope.splitUpCapacity=[];
+                    if(result.splitUpCapacity) {
+                        angular.forEach(result.splitUpCapacity, function (val, key) {
+                            var a=key.replace(/([A-Z])/g, ' $1').replace(/^./, function(str) {
+                                return str.toUpperCase();
+                            });
+                            $rootScope.splitUpCapacity.push({id:key,val:a});
+                        });
+                        if( $rootScope.splitUpCapacity && $rootScope.splitUpCapacity.length >0) {
+                            $scope.$emit('CHANGE_splitUp', $rootScope.splitUpCapacity[0].id);
+                            capaCtr.splitUp = $rootScope.splitUpCapacity[0].val;
+                            capaCtr.createLable(result, $rootScope.splitUpCapacity[0].id);
+                        }
+                    } else {
+                        capaCtr.createLable(result,'provider');
+                    }
+                });
+            };
+            capaCtr.createLable= function(result,viewType){
+                capaCtr.createChart();
+                if(result && result.capacity) {
+                    capaCtr.capaGridOptions.data = [];
+                    capaCtr.capaGridOptions.columnDefs = [
+                        {name: 'name', field: 'name'},
+                        {name: 'totalCapacity', field: 'capacity.totalCapacity'}
+                    ];
+                    capaCtr.pieChat.totalCoust = result.capacity.totalCapacity;
+                    capaCtr.pieChat.data = [];
+                    capaCtr.barChat.data = [];
+                    // create bar
+                    //if(viewType === 'ProviderView'){
+                    capaCtr.capaGridOptions.data = result.splitUpCapacity[viewType];
+                    angular.forEach(result.splitUpCapacity[viewType], function (value) {
+                        capaCtr.pieChat.data.push({
+                            key: value.name,
+                            value: value.capacity.totalCapacity
+                        });
+                    });
+                    if(result.capacity && result.capacity.AWS && result.capacity.AWS.services) {
+                        capaCtr.serviceCapacity = result.capacity.AWS.services;
+                        angular.forEach(result.capacity.AWS.services, function (valueChild, keyChild) {
+                            var va = [];
+                            capaCtr.capaGridOptions.columnDefs.push({
+                                name: keyChild,
+                                field: 'capacity.AWS.services.' + keyChild
+                            })
+                            angular.forEach(result.splitUpCapacity[viewType], function (valBar) {
+                                var chVal = '';
+                                if (valBar.capacity.AWS.services[keyChild]) {
+                                    chVal = valBar.capacity.AWS.services[keyChild];
+                                } else {
+                                    chVal = 0;
+                                }
+                                va.push(
+                                    {
+                                        "label": valBar.name,
+                                        "value": chVal
+                                    }
+                                );
+                            });
+                            capaCtr.barChat.data.push({
+                                "key": keyChild,
+                                "values": va
+                            });
+                        });
+                    }
+                }
+            };
+            capaCtr.trendsChart=function(fltObj){
+                capaCtr.trendLineChart={};
+                capaCtr.trendLineChart.options = {
                     chart: {
-                        type: 'multiBarHorizontalChart',
-                        height: 300,
+                        //type: 'stackedAreaChart',
+                        type: 'lineChart',
+                        height: 350,
                         margin: {
                             top: 20,
                             right: 20,
-                            bottom: 60,
-                            left: 40
+                            bottom: 40,
+                            left: 60
                         },
-                        duration: 50,
                         x: function (d) {
-                            return d.label;
+                            return d[0];
                         },
                         y: function (d) {
-                            return d.value;
+                            return d[1];
                         },
-                        showControls: false,
-                        showValues: true,
+                        useVoronoi: false,
+                        clipEdge: true,
+                        duration: 1000,
+                        useInteractiveGuideline: true,
                         xAxis: {
-                            showMaxMin: false
+                            showMaxMin: false,
+                            axisLabel: 'Date',
+                            tickFormat: function (d) {
+                                return d3.time.format('%x')(new Date(d))
+                            }
                         },
                         yAxis: {
-                            axisLabel: 'Values',
+                            axisLabel: 'capacity in $',
                             tickFormat: function (d) {
                                 return d3.format(',.2f')(d);
                             }
-                        }
-                    }
-                },
-                data:
-                    [
-                       {
-                            "key": "EC2",
-                            "color": "#58AAE2",
-                            "values": []
                         },
-                        {
-                            "key": "RDS",
-                            "color": "#EF892F",
-                            "values": []
-                        },
-                        {
-                            "key": "S3",
-                            "color": "#8CAEDA",
-                            "values": []
+                        zoom: {
+                            enabled: true,
+                            scaleExtent: [1, 10],
+                            useFixedDomain: false,
+                            useNiceScale: false,
+                            horizontalOff: true,
+                            verticalOff: true,
+                            unzoomEventType: 'dblclick.zoom'
                         }
-                    ]
-
-            };
+                    }
+                };
+                capaCtr.trendLineChart.data = [];
+                var param = {
+                    url: ''
+                };
 
-            capacityObj.capacityGridOptions = {
-                columnDefs: [
-                    { name:'name',field: 'name' },
-                    { name:'totalCost',field: 'cost.totalCost'},
-                    { name:'EC2',field:'cost.awsCosts.serviceCosts.ec2'},
-                    { name:'RDS',field:'cost.awsCosts.serviceCosts.rds'},
-                    { name:'S3',field:'cost.awsCosts.serviceCosts.s3'}
-                ],
-                enableGridMenu: true,
-                enableSelectAll: true,
-                exporterMenuPdf: false,
-                exporterCsvFilename: 'costFile.csv',
-                exporterCsvLinkElement: angular.element(document.querySelectorAll(".custom-csv-link-location")),
-                onRegisterApi: function(gridApi){
-                    $scope.gridApi = gridApi;
+                if(fltObj && fltObj.org){
+                    var entityId=null;
+                    if(fltObj.provider){
+                        entityId=fltObj.provider.id;
+                    } else {
+                        entityId=fltObj.org.id;
+                    }
+                    //http://192.168.152.139:3001
+                   // param.url='/analytics/capacity/trend?parentEntityId='+fltObj.org.id+'&entityId='+fltObj.org.id+'&toTimeStamp='+new Date()+'&period='+fltObj.period+'&interval=86400'
                 }
-            };
 
-            var param={
-                url:'src/partials/sections/dashboard/analytics/data/cost.json'
+                genSevs.promiseGet(param).then(function (result) {
+                    if(result.capacityTrends && result.capacityTrends.length) {
+                        capaCtr.trendLineChart.totalCapacity = result.capacity.totalCapacity;
+                        capaCtr.trendLineChart.data = [];
+                        angular.forEach(result.capacity.AWS.services, function (valueChild, keyChild) {
+                            var va = [];
+                            angular.forEach(result.capacityTrends, function (value) {
+                                var chVal='';
+                                if(value.capacity.AWS.services[keyChild]){
+                                    chVal=value.capacity.AWS.services[keyChild];
+                                } else {
+                                    chVal=0;
+                                }
+                                va.push([value.fromTime,chVal]);
+                            });
+                            capaCtr.trendLineChart.data.push({
+                                "key": keyChild,
+                                "values": va
+                            });
+                        });
+                        capaCtr.trendLineChart.data[0].values.push([]);
+                    }
+                });
             };
-            genSevs.promiseGet(param).then(function(result){
-                capacityObj.capacityGridOptions.data = result.splitUpCosts.businessUnits;
-                capacityObj.pieChat.totalCoust= result.cost.totalCost;
-                angular.forEach(result.splitUpCosts.businessUnits,function (value) {
-                    capacityObj.pieChat.data.push( {
-                        key: value.name,
-                        y:value.cost.totalCost
-                    });
-                    capacityObj.barChat.data[0].values.push( {
-                        "label" :value.name ,
-                        "value" : value.cost.awsCosts.serviceCosts.ec2
-                    });
-                    capacityObj.barChat.data[1].values.push( {
-                        "label" :value.name ,
-                        "value" : value.cost.awsCosts.serviceCosts.rds
+            $scope.$on('CHANGE_VIEW', function (event, data) {
+                if (data) {
+                    capaCtr.splitUp = data.replace(/([A-Z])/g, ' $1').replace(/^./, function (str) {
+                        return str.toUpperCase();
                     });
-                    capacityObj.barChat.data[2].values.push( {
-                        "label" :value.name ,
-                        "value" : value.cost.awsCosts.serviceCosts.s3
-                    });
-                });
-                // angular.forEach(result.splitUpCosts.providers,function (valu) {
-                //     capacityObj.pieChat.data.push( {
-                //         key: valu.name,
-                //         y:valu.cost.totalCost
-                //     });
-                // });
+                    capaCtr.createLable(capaCtr.chartData, data);
+                }
             });
-
-
-
-
-        $scope.optionsLine= {
-            chart: {
-                type: 'cumulativeLineChart',
-                height:250,
-                margin : {
-                    top: 20,
-                    right: 20,
-                    bottom: 60,
-                    left: 65
-                },
-                x: function(d){ return d[0]; },
-                y: function(d){ return d[1]/10; },
-                color: d3.scale.category10().range(),
-                duration: 300,
-                useInteractiveGuideline: true,
-                clipVoronoi: false,
-
-                xAxis: {
-                    axisLabel: 'X Axis',
-                    tickFormat: function(d) {
-                        return d3.time.format('%Y/%m/%d')(new Date(d))
-                    },
-                    showMaxMin: false,
-                    staggerLabels: true
-                },
-
-                yAxis: {
-                    axisLabel: 'Y Axis',
-                    tickFormat: function(d){
-                        return d3.format(',.2f')(d);
-                    },
-                    axisLabelDistance: 20
+            $rootScope.applyFilter =function(filterApp,period){
+                analyticsServices.applyFilter(filterApp,period);
+                if($state.current.name === "dashboard.analytics.capacity") {
+                    capaCtr.getCapacityData($rootScope.filterNewEnt);
                 }
-            }
-        };
-
-        $scope.dataLine = [  {
-            key: "EC2",
-            values: [ [ 1083297600000 , 30] , [ 1085976000000 , 50] , [ 1088568000000 , 20] ]
-
-        },
-            {
-                key: "RDS",
-                values: [ [ 1083297600000 , 20] , [ 1085976000000 ,20] , [ 1088568000000 , 60]]
-
-            },
-
-
-            {
-                key: "S3",
-                values: [ [ 1083297600000 , 10] , [ 1085976000000 , 50],[ 1088568000000 , 40]]
-            }];
+            };
+            capaCtr.init =function(){
+                analyticsServices.initFilter();
+                capaCtr.createChart();
+                $timeout(function () {
+                    $rootScope.applyFilter(true,'month');
+                    capaCtr.trendsChart($rootScope.filterNewEnt);
+                    var treeNames = ['Analytics','capacity'];
+                    $rootScope.$emit('treeNameUpdate', treeNames);
+                },500);
+            };
+            capaCtr.init();
 
-    }]);
+        }]);
 })(angular);
diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/costCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/costCtrl.js
index 76f5a39a3..509cf190e 100644
--- a/client/cat3/src/partials/sections/dashboard/analytics/controller/costCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/costCtrl.js
@@ -4,8 +4,6 @@
         .controller('costCtrl', ['$scope', '$rootScope', '$state','analyticsServices', 'genericServices','$timeout', function ($scope,$rootScope,$state,analyticsServices,genSevs,$timeout){
         $rootScope.stateItems = $state.params;
             //analyticsServices.initFilter();
-        // var treeNames = ['Analytics','Cost'];
-        // $rootScope.$emit('treeNameUpdate', treeNames);
             var costObj =this;
             costObj.chartData=[];
             costObj.splitUp=null;
@@ -40,7 +38,7 @@
                             y: function (d) {
                                 return d.value;
                             },
-                            showLabels: true,
+                            showLabels: false,
                             labelType: "value",
                             labelThreshold: 0.01,
                             labelSunbeamLayout: true,
@@ -60,9 +58,9 @@
                                 top: 20,
                                 right: 20,
                                 bottom: 60,
-                                left: 40
+                                left: 60
                             },
-                            duration: 50,
+                            duration:1000,
                             stacked: true,
                             x: function (d) {
                                 return d.label;
@@ -73,11 +71,12 @@
                             showControls: true,
                             showValues: true,
                             xAxis: {
-                                axisLabel: '',
+                                axisLabel: 'Aggregate',
                                 showMaxMin: false,
                                 staggerLabels:false
                             },
                             yAxis: {
+                                axisLabel: 'Cost in $',
                                 tickFormat: function (d) {
                                     return d3.format(',.2f')(d);
                                 }
@@ -112,6 +111,7 @@
                     } else {
                         entityId=fltObj.org.id;
                     }
+                  //param.url='http://d4d.rlcatalyst.com/analytics/cost/aggregate?parentEntityId=46d1da9a-d927-41dc-8e9e-7e926d927537&entityId=57f49acdbc45e71f11491f8c&toTimeStamp=Wed%20Oct%2005%202016%2016:03:08%20GMT+0530%20(IST)&period=month';
                     param.url='/analytics/cost/aggregate?parentEntityId='+fltObj.org.id+'&entityId='+entityId+'&toTimeStamp='+new Date()+'&period='+fltObj.period;
                 }
 
@@ -125,15 +125,18 @@
                             });
                             $rootScope.splitUpCosts.push({id:key,val:a});
                         });
-                        $scope.$emit('CHANGE_splitUp', $rootScope.splitUpCosts[0].id);
-                        costObj.splitUp= $rootScope.splitUpCosts[0].val;
-                        costObj.createLable(result, $rootScope.splitUpCosts[0].id);
+                        if( $rootScope.splitUpCosts && $rootScope.splitUpCosts.length >0) {
+                            $scope.$emit('CHANGE_splitUp', $rootScope.splitUpCosts[0].id);
+                            costObj.splitUp = $rootScope.splitUpCosts[0].val;
+                            costObj.createLable(result, $rootScope.splitUpCosts[0].id);
+                        }
                     } else {
                         costObj.createLable(result,'provider');
                     }
                 });
             };
             costObj.createLable= function(result,viewType){
+                costObj.createChart();
                 if(result && result.cost) {
                     costObj.costGridOptions.data = [];
                     costObj.costGridOptions.columnDefs = [
@@ -188,12 +191,12 @@
                     chart: {
                         //type: 'stackedAreaChart',
                         type: 'lineChart',
-                        height: 250,
+                        height: 350,
                         margin: {
                             top: 20,
                             right: 20,
-                            bottom: 30,
-                            left: 40
+                            bottom: 40,
+                            left: 60
                         },
                         x: function (d) {
                             return d[0];
@@ -203,15 +206,17 @@
                         },
                         useVoronoi: false,
                         clipEdge: true,
-                        duration: 10,
+                        duration: 1000,
                         useInteractiveGuideline: true,
                         xAxis: {
                             showMaxMin: false,
+                            axisLabel: 'Date',
                             tickFormat: function (d) {
                                 return d3.time.format('%x')(new Date(d))
                             }
                         },
                         yAxis: {
+                            axisLabel: 'Cost in $',
                             tickFormat: function (d) {
                                 return d3.format(',.2f')(d);
                             }
@@ -240,7 +245,7 @@
                         entityId=fltObj.org.id;
                     }
                     //http://192.168.152.139:3001
-                    param.url='/analytics/cost/trend?parentEntityId='+fltObj.org.id+'&entityId='+fltObj.org.id+'&toTimeStamp='+new Date()+'&period='+fltObj.period+'&interval=86400'
+                   param.url='/analytics/cost/trend?parentEntityId='+fltObj.org.id+'&entityId='+fltObj.org.id+'&toTimeStamp='+new Date()+'&period='+fltObj.period+'&interval=86400'
                 }
 
                 genSevs.promiseGet(param).then(function (result) {
@@ -263,14 +268,17 @@
                                 "values": va
                             });
                         });
+                        costObj.trendLineChart.data[0].values.push([]);
                     }
                 });
             };
             $scope.$on('CHANGE_VIEW', function (event, data) {
-                costObj.splitUp=data.replace(/([A-Z])/g, ' $1').replace(/^./, function(str) {
-                    return str.toUpperCase();
-                });
-                costObj.createLable(costObj.chartData,data);
+                if (data) {
+                    costObj.splitUp = data.replace(/([A-Z])/g, ' $1').replace(/^./, function (str) {
+                        return str.toUpperCase();
+                    });
+                    costObj.createLable(costObj.chartData, data);
+                }
             });
             $rootScope.applyFilter =function(filterApp,period){
                 analyticsServices.applyFilter(filterApp,period);
@@ -284,7 +292,9 @@
                 $timeout(function () {
                     $rootScope.applyFilter(true,'month');
                     costObj.trendsChart($rootScope.filterNewEnt);
-                },200);
+                    var treeNames = ['Analytics','Cost'];
+                    $rootScope.$emit('treeNameUpdate', treeNames);
+                },500);
             };
             costObj.init();
 
diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/usageCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/usageCtrl.js
index 04b66b4c0..ab09f30e4 100644
--- a/client/cat3/src/partials/sections/dashboard/analytics/controller/usageCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/usageCtrl.js
@@ -4,17 +4,19 @@
         .controller('usageCtrl', ['$scope', '$rootScope', '$state','analyticsServices', 'genericServices','$timeout', function ($scope,$rootScope,$state,analyticsServices,genSevs,$timeout){
         $rootScope.stateItems = $state.params;
             var usage =this;
+            usage.trendLineChart={
+                data:[]
+            };
             usage.trendsChart=function(fltObj){
-                usage.trendLineChart={};
                 usage.trendLineChart.options = {
                     chart: {
                         //type: 'stackedAreaChart',
                         type: 'lineChart',
-                        height: 350,
+                        height: 400,
                         margin: {
                             top: 20,
                             right: 20,
-                            bottom: 30,
+                            bottom:70,
                             left: 40
                         },
                         x: function (d) {
@@ -28,9 +30,10 @@
                         duration: 10,
                         useInteractiveGuideline: true,
                         xAxis: {
+                            axisLabel: 'Date',
                             showMaxMin: false,
                             tickFormat: function (d) {
-                                return d3.time.format('%x')(new Date(d))
+                                return d3.time.format('%d/%m %H:%M')(new Date(d))
                             }
                         },
                         yAxis: {
@@ -63,41 +66,72 @@
                     }
                 };
                 usage.trendLineChart.data = [];
+                usage.legends=[];
                 usage.costGridOptions.columnDefs = [];
-              var  $today = new Date();
-               var $yesterday = new Date($today);
-                $yesterday.setDate($today.getDate() - 1);
-                   // if(fltObj && fltObj.resources && fltObj.resources.length >0) {
-                        //angular.forEach(fltObj.resources, function (resId) {
-                            var param = {
-                                url: '/analytics/trend/usage?resource='+fltObj.resources+'&fromTimeStamp='+$yesterday+'&toTimeStamp='+ $today+'&interval=3600'
-                            };
-                            genSevs.promiseGet(param).then(function (result) {
-                                angular.forEach(result, function (valu, keyChild) {
-                                    var va = [];
-                                    angular.forEach(valu.dataPoints, function (value) {
-                                        va.push([Date.parse(value.fromTime), value.average]);
-                                    });
-                                    usage.trendLineChart.data.push({
-                                        "key": keyChild,
-                                        "values": va
+                usage.getData(fltObj);
+                 };
+                usage.getData=function(fltObj){
+                    usage.trendLineChart.data = [];
+                    usage.costGridOptions.data=[];
+                    var  $today = new Date();
+                    var $yesterday = new Date($today);
+                    $yesterday.setDate($today.getDate() - 1);
+                    if(fltObj && fltObj.resources && fltObj.resources.length >0) {
+                    angular.forEach(fltObj.resources, function (resId) {
+                    var param = {
+                       url: '/analytics/trend/usage?resource='+resId+'&fromTimeStamp='+$yesterday+'&toTimeStamp='+ $today+'&interval=3600'
+                    };
+                    genSevs.promiseGet(param).then(function (result) {
+                       // angular.forEach(result[usage.splitUp], function (valu, keyChild) {
+                           var va = [];
+                            if(result && result.length >0) {
+                                usage.costGridOptions.columnDefs=[
+                                    {name: 'name', field: 'name'},
+                                    {name: 'fromTime', field: 'fromTime'},
+                                    {name: 'toTime', field: 'toTime'},
+                                    {name: 'maximum', field: 'maximum'},
+                                    {name: 'minimum', field: 'minimum'},
+                                    {name: 'average', field: 'average'},
+                                ]
+                                angular.forEach(result[usage.splitUp].dataPoints, function (value) {
+                                    usage.costGridOptions.data.push({
+                                        name:$rootScope.filterNewEnt.platformId[resId],
+                                        fromTime:value.fromTime,
+                                        toTime:value.toTime,
+                                        maximum:value.maximum,
+                                        minimum:value.minimum,
+                                        average:value.average
                                     });
+                                    va.push([Date.parse(value.fromTime), value.average]);
                                 });
-                            });
-                        ///});
-                   /// }
-                 };
+                                usage.trendLineChart.data.push({
+                                    "key":$rootScope.filterNewEnt.platformId[resId],
+                                    "values": va
+                                });
+                            }
+                        });
+                  // }
+                    });
+                    }
+                };
                 $rootScope.applyFilter =function(filterApp,period){
                     analyticsServices.applyFilter(filterApp,period);
                     if($state.current.name === "dashboard.analytics.usage") {
-                        usage.trendsChart($rootScope.filterNewEnt);
+                        usage.splitUp='CPUUtilization';
+                       usage.trendsChart($rootScope.filterNewEnt);
                     }
                 };
+                usage.splitChange=function() {
+                    usage.getData($rootScope.filterNewEnt);
+                };
                 usage.init =function(){
                         $rootScope.organNewEnt.instanceType='Unassigned';
                         $rootScope.organNewEnt.provider='0';
-                        $scope.$emit('INI_usage', 'Unassigned');
-                        $timeout(function(){$rootScope.applyFilter(true,'month')},200);
+                    $rootScope.$emit('INI_usage', 'Unassigned');
+                        $timeout(function(){$rootScope.applyFilter(true,'month')},500);
+                        var treeNames = ['Analytics','Usage'];
+                        $rootScope.$emit('treeNameUpdate', treeNames);
+
                 };
             usage.init();
 
diff --git a/client/cat3/src/partials/sections/dashboard/analytics/view/analyticsTreeMenu.html b/client/cat3/src/partials/sections/dashboard/analytics/view/analyticsTreeMenu.html
index d89df15a8..4e1c17730 100644
--- a/client/cat3/src/partials/sections/dashboard/analytics/view/analyticsTreeMenu.html
+++ b/client/cat3/src/partials/sections/dashboard/analytics/view/analyticsTreeMenu.html
@@ -2,12 +2,8 @@
 <link rel="stylesheet" type="text/css" href="catalyst/partials/globals/treeComponent/treeDirective.css"/>
 
 <div id='analyticsTreeMenuPage' ng-controller="analyticsCtrl">
-	<span ng-show="!isLoading" class="tree-wrapper">
-		<span ng-click="analytic.showTreeOverlay()" class="minifyme cursor"> <i class="fa fa-arrow-circle-right black hit"></i> </span>
-		<span ng-click="analytic.hideTreeOverlay()" class="minifyme cursor" title="Hide Tree" ng-show="showTreeMenu"> <i class="fa fa-arrow-circle-left black hit"></i> </span>
-	</span>
-	<div id='navigPage'>
-		<div id='navigPage-inner' ng-show="showTreeMenu">
+	<div id='navigPage' ng-mouseover="showTreeOverlay()" ng-mouseleave="hideTreeOverlay()" ng-class="{'show-left-tree':showTree}">
+		<div id='navigPage-inner'>
 			<div id="treeParent">
 				<ul class="tree-ul">
 				    <li>
@@ -18,20 +14,29 @@
 				                <ul class="tree-ul">
 				                    <li ui-sref="dashboard.analytics.cost" class="pointer-cursor" ui-sref-active='activeSection'>
 				                        <div class="liContents">
-				                        	<i class="icon fa fa-money label-spacing"></i>
-					                        <span>Cost</span>
+				                        	<div class="liContents-wrapper">
+					                        	<i class="icon fa fa-money label-spacing"></i>
+						                        <span>Cost</span>
+						                        <i class="caret-spacing fa fa-caret-left pull-right" ng-show="stateItems.filterView.cost"></i>
+						                    </div>
 				                        </div>
 				                    </li>
 				                    <li ui-sref="dashboard.analytics.capacity" class="pointer-cursor" ui-sref-active='activeSection'>
 				                        <div class="liContents">
-				                        	<i class="icon fa fa-pie-chart label-spacing"></i>
-					                        <span>Capacity</span>
+				                        	<div class="liContents-wrapper">
+					                        	<i class="icon fa fa-pie-chart label-spacing"></i>
+						                        <span>Capacity</span>
+						                        <i class="caret-spacing fa fa-caret-left pull-right" ng-show="stateItems.filterView.capacity"></i>
+						                    </div>
 				                        </div>
 				                    </li >
 				                    <li ui-sref="dashboard.analytics.usage" class="pointer-cursor" ui-sref-active='activeSection'>
 				                        <div class="liContents">
-				                        	<i class="icon fa fa-line-chart label-spacing"></i>
-					                        <span>Usage</span>
+				                        	<div class="liContents-wrapper">
+					                        	<i class="icon fa fa-line-chart label-spacing"></i>
+						                        <span>Usage</span>
+						                        <i class="caret-spacing fa fa-caret-left pull-right" ng-show="stateItems.filterView.usage"></i>
+						                    </div>
 				                        </div>
 				                    </li>
 				                </ul>
diff --git a/client/cat3/src/partials/sections/dashboard/analytics/view/analyticsTreeMenu.scss b/client/cat3/src/partials/sections/dashboard/analytics/view/analyticsTreeMenu.scss
deleted file mode 100644
index b5d5d75fc..000000000
--- a/client/cat3/src/partials/sections/dashboard/analytics/view/analyticsTreeMenu.scss
+++ /dev/null
@@ -1,61 +0,0 @@
-#navigPage {
-  background: linear-gradient(to right, #2c3638 99%, #2c3638 100%);
-  z-index: 1;
-  position: fixed;
-  width: 254px;
-  z-index: 3;
-  font-size: 12px;
-
-  #navigPage-inner {
-    background: linear-gradient(to right, #2c3638 99%, #2c3638 100%);
-    color: #fff;
-    z-index: 1;
-    width: 100%;
-    overflow-y: auto;
-  }
-
-  .tree-ul {
-    padding-left: 15px;
-  }
-
-  .liContents {
-    line-height: 2.2;
-  }
-
-  i {
-    color:#fff;
-  }
-
-  span {
-    color:#fff;
-  }
-
-  .activeSection {
-    font-weight: bold;
-    background: #3b4142;
-  }
-}
-
-.tree-close {
-  width: 35px !important;
-}
-
-.minifyme {
-  background: #D7DAE2;
-  border-bottom: 1px solid #818181;
-  color: #7E7E7E;
-  z-index: 100;
-  text-align: center;
-  padding: 0;
-  width: 38px;
-  height: 28px;
-  display: block;
-  position: absolute;
-  right: 0px;
-  border-radius: 5px 0 0 5px;
-  cursor: pointer;
-  font-size: 19px;
-  -webkit-transition: all .1s linear 0s;
-  transition: all .1s linear 0s;
-  left: 216px;
-}
\ No newline at end of file
diff --git a/client/cat3/src/partials/sections/dashboard/analytics/view/capacity.html b/client/cat3/src/partials/sections/dashboard/analytics/view/capacity.html
index 0788db3bf..606e5300c 100644
--- a/client/cat3/src/partials/sections/dashboard/analytics/view/capacity.html
+++ b/client/cat3/src/partials/sections/dashboard/analytics/view/capacity.html
@@ -1,40 +1,56 @@
-<div class="leftnavdiv">
+<div class="leftnavdiv" style="padding-right:7px;">
     <br>
-     <div ng-if="analytic.tabShowChat">
-         <div class="row">
-             <div class="col-lg-4 col-md-4 col-sm-12" >
-                 <div class="box box-infobox box-info">
-                     <div class="box-header with-border"><h3 class="box-title">Aggregate capacity</h3>
-                         <div class="box-tools pull-right">
-                             <span data-toggle="tooltip" title="3 New Messages" class="badge bg-yellow">Total Cost - ${{capacity.pieChat.totalCoust}}</span>
-                        </div>
-                     </div>
-                     <div class="box-body" style="overflow-x: auto"><nvd3 options="capacity.pieChat.option" data="capacity.pieChat.data"></nvd3></div>
-                 </div>
-             </div>
-             <div class="col-lg-8 col-md-8 col-sm-12" >
-                 <div class="box box-infobox box-info">
-                     <div class="box-header with-border"><h3 class="box-title">Distribution of all services across BU's</h3>
-                         <div class="box-tools pull-right">
-                             <span data-toggle="tooltip" title="3 New Messages" class="badge bg-yellow">Total Cost - ${{capacity.pieChat.totalCoust}}</span>
-                         </div>
-                     </div>
-                     <div class="box-body" style="overflow-x: auto"><nvd3 options="capacity.barChat.option" data="capacity.barChat.data"></nvd3></div>
-                 </div>
-             </div>
-             <div class="col-lg-12 col-md-12 col-sm-12" >
-                 <div class="box box-infobox box-info">
-                     <div class="box-header with-border"><h3 class="box-title">Daily trends of usage across BU's</h3>
-                         <!--<div class="box-tools pull-right"> Total Cost-->
-                             <!--<span data-toggle="tooltip" title="3 New Messages" class="badge bg-yellow">{{cost.pieChat.totalCoust}}</span>-->
-                         <!--</div>-->
-                     </div>
-                     <div class="box-body" style="overflow-x: auto"><nvd3 options="optionsLine" data="dataLine" class="with-3d-shadow with-transitions"></nvd3></div>
-                 </div>
-             </div>
-         </div>
-     </div>
+    <div class="col-lg-12 col-md-12 col-sm-12 top-stats">
+        <div class="col-lg-9 col-md-9 col-sm-12 no-padding" >
+            <span class="box-title font-size-15" ng-show="capaCtr.pieChat.data.length >0" ><span>Total capaCtr:</span> <span class="red">${{capaCtr.pieChat.totalCoust}}</span> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+                             <span class="box-title font-size-15" ng-show="capaCtr.pieChat.data.length >0"><span>Services Capacity</span>
+                         <span class="badge" ng-repeat="(value , key) in capaCtr.serviceCapacity"> {{value}} : ${{key}}</span>
+                         </span>
+        </div>
+        <div class="col-lg-3 col-md-3 col-sm-12 text-right no-padding" >
+            <div ng-show="stateItems.filterView.splitUpType && splitUpCapacity.length > 1">
+                <span class="box-title font-size-15">Segregated by  </span>
+                <select class="form-control select2 select2-hidden-accessible" ng-model="analytic.splitUp" ng-options="sp.id as sp.val for sp in splitUpcapaCtrs" >
+                </select>
+            </div>
+        </div>
+    </div>
+    <div class="clearfix"></div>
+    <div ng-if="analytic.tabShowChat">
+        <div class="row">
+            <div class="clearfix"></div>
+            <div class="col-lg-4 col-md-4 col-sm-12" >
+                <div class="box box-infobox box-info">
+                    <div class="box-header with-border">
+                        <h3 class="box-title font-size-15"><i class="fa fa-pie-chart"></i> Aggregate Capacity</h3>
+                    </div>
+                    <div class="box-body" ><nvd3 options="capaCtr.pieChat.option" data="capaCtr.pieChat.data"></nvd3></div>
+                </div>
+            </div>
+            <div class="col-lg-8 col-md-8 col-sm-12" >
+                <div class="box box-infobox box-info">
+                    <div class="box-header with-border"><h3 class="box-title font-size-15"><i class="fa fa-bar-chart"></i> Distribution of all services across {{capaCtr.splitUp}}</h3>
+
+                    </div>
+                    <div class="box-body" ><nvd3 options="capaCtr.barChat.option" data="capaCtr.barChat.data"></nvd3></div>
+                </div>
+            </div>
+            <div class="col-lg-12 col-md-12 col-sm-12" ng-show="false" >
+                <div class="box box-infobox box-info">
+                    <div class="box-header with-border"><h3 class="box-title font-size-15"> <i class="fa fa-line-chart"></i> Daily trends of cost across organization</h3>
+                    </div>
+                    <div class="box-body" ><nvd3 options="capaCtr.trendLineChart.options" data="capaCtr.trendLineChart.data" class="with-3d-shadow with-transitions"></nvd3></div>
+                </div>
+            </div>
+        </div>
+    </div>
     <div ng-if="analytic.tabShowReport">
-        <div ui-grid="capacity.capacityGridOptions" ui-grid-selection ui-grid-exporter class="grid"></div>
+        <div ng-if="capaCtr.capaGridOptions.data.length >0" ui-grid="capaCtr.capaGridOptions" ui-grid-selection ui-grid-exporter ui-grid-auto-resize class="grid"></div>
+        <div ng-if="!capaCtr.capaGridOptions.data.length >0">
+            <div class="alert alert-warning">
+                No Data Available.
+            </div>
+        </div>
+
     </div>
 </div>
\ No newline at end of file
diff --git a/client/cat3/src/partials/sections/dashboard/analytics/view/cost.html b/client/cat3/src/partials/sections/dashboard/analytics/view/cost.html
index 6ca4728fd..d8cb1edb7 100644
--- a/client/cat3/src/partials/sections/dashboard/analytics/view/cost.html
+++ b/client/cat3/src/partials/sections/dashboard/analytics/view/cost.html
@@ -1,29 +1,35 @@
 <div class="leftnavdiv" style="padding-right:7px;">
     <br>
+    <div class="col-lg-12 col-md-12 col-sm-12 top-stats">
+        <div class="col-lg-9 col-md-9 col-sm-12 no-padding" >
+            <span class="box-title font-size-15" ng-show="cost.pieChat.data.length >0" ><span>Total Cost:</span> <span class="red">${{cost.pieChat.totalCoust}}</span> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+                             <span class="box-title font-size-15" ng-show="cost.pieChat.data.length >0"><span>Services Cost</span>
+                         <span class="badge" ng-repeat="(value , key) in cost.serviceCosts"> {{value}} : ${{key}}</span>
+                         </span>
+        </div>
+        <div class="col-lg-3 col-md-3 col-sm-12 text-right no-padding" >
+            <div ng-show="stateItems.filterView.splitUpType && splitUpCosts.length > 1">
+                <span class="box-title font-size-15">Segregated by  </span>
+                <select class="form-control select2 select2-hidden-accessible" ng-model="analytic.splitUp" ng-options="sp.id as sp.val for sp in splitUpCosts" >
+                </select>
+            </div>
+        </div>
+    </div>
+    <div class="clearfix"></div>
      <div ng-if="analytic.tabShowChat">
          <div class="row">
-             <div class="col-lg-12 col-md-12 col-sm-12" >
-                 <div class="box box-infobox box-info" style="border-top-color:#cc0000">
-                     <div class="box-header with-border">
-                         <div class="col-lg-4 col-md-4 col-sm-12" ><h3 class="box-title" ng-show="cost.pieChat.data.length >0">Total Cost  ${{cost.pieChat.totalCoust}}</h3></div>
-                         <div class="col-lg-8 col-md-8 col-sm-12" ><h3 class="box-title" ng-show="cost.pieChat.data.length >0">Services Cost
-                             <span class="badge" style="margin-right: 10px;"  ng-repeat="(value , key) in cost.serviceCosts"> {{value}} : ${{key}}</span>
-                         </h3></div>
-                     </div>
-                 </div>
-             </div>
              <div class="clearfix"></div>
              <div class="col-lg-4 col-md-4 col-sm-12" >
                  <div class="box box-infobox box-info">
                      <div class="box-header with-border">
-                         <h3 class="box-title">Aggregate cost</h3>
+                         <h3 class="box-title font-size-15"><i class="fa fa-pie-chart"></i> Aggregate cost</h3>
                      </div>
                      <div class="box-body" ><nvd3 options="cost.pieChat.option" data="cost.pieChat.data"></nvd3></div>
                  </div>
              </div>
              <div class="col-lg-8 col-md-8 col-sm-12" >
                  <div class="box box-infobox box-info">
-                     <div class="box-header with-border"><h3 class="box-title">Distribution of all services across {{cost.splitUp}}</h3>
+                     <div class="box-header with-border"><h3 class="box-title font-size-15"><i class="fa fa-bar-chart"></i> Distribution of all services across {{cost.splitUp}}</h3>
 
                      </div>
                      <div class="box-body" ><nvd3 options="cost.barChat.option" data="cost.barChat.data"></nvd3></div>
@@ -31,10 +37,7 @@ <h3 class="box-title">Aggregate cost</h3>
              </div>
              <div class="col-lg-12 col-md-12 col-sm-12" >
                  <div class="box box-infobox box-info">
-                     <div class="box-header with-border"><h3 class="box-title">Daily trends of cost across organization</h3>
-                         <div class="box-tools pull-right" ng-show="cost.trendLineChart.data.length >0">
-                             <span data-toggle="tooltip" title="3 New Messages" class="badge bg-yellow" >Total Cost  ${{cost.trendLineChart.totalCost}}</span>
-                         </div>
+                     <div class="box-header with-border"><h3 class="box-title font-size-15"> <i class="fa fa-line-chart"></i> Daily trends of cost across organization</h3>
                      </div>
                      <div class="box-body" ><nvd3 options="cost.trendLineChart.options" data="cost.trendLineChart.data" class="with-3d-shadow with-transitions"></nvd3></div>
                  </div>
@@ -50,4 +53,4 @@ <h3 class="box-title">Aggregate cost</h3>
         </div>
 
     </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/client/cat3/src/partials/sections/dashboard/analytics/view/usage.html b/client/cat3/src/partials/sections/dashboard/analytics/view/usage.html
index 69a6eee54..46d4870ee 100644
--- a/client/cat3/src/partials/sections/dashboard/analytics/view/usage.html
+++ b/client/cat3/src/partials/sections/dashboard/analytics/view/usage.html
@@ -1,10 +1,23 @@
 <div class="leftnavdiv" style="padding-right:7px;">
     <br>
+    <div class="col-lg-12 col-md-12 col-sm-12 top-stats">
+        <span class="pull-right">
+        <span class="box-title font-size-15">Usage Type</span>
+        <select  class="form-control select2 select2-hidden-accessible " ng-change="usage.splitChange()" style="width: auto;height: 31px;display: table-cell" ng-model="usage.splitUp" >
+            <option value="CPUUtilization">CPUUtilization</option>
+            <option value="DiskReadBytes">DiskReadBytes</option>
+            <option value="DiskWriteBytes">DiskWriteBytes</option>
+            <option value="NetworkIn">NetworkIn</option>
+            <option value="NetworkOut">NetworkOut</option>
+        </select>
+            </span>
+    </div>
+    <div class="clearfix"></div>
     <div ng-if="analytic.tabShowChat">
-        <div class="row">
+        <div class="row usage">
             <div class="col-lg-12 col-md-12 col-sm-12" >
                 <div class="box box-infobox box-info">
-                    <div class="box-header with-border"><h3 class="box-title">Daily trends of usage</h3>
+                    <div class="box-header with-border"><h3 class="box-title font-size-15"><i class="fa fa-line-chart"></i> Daily trends of usage</h3>
                         <!--<div class="box-tools pull-right">-->
                         <!--<button type="button" class="btn btn-link" ng-click="cost.trendsChartType ='lineChart'"><i class="fa fa-line-chart" aria-hidden="true"></i></button>-->
                         <!--<button type="button" class="btn btn-link" ng-click="cost.trendsChartType ='stackedAreaChart' "><i class="fa fa-area-chart"></i></button>-->
@@ -16,8 +29,8 @@
         </div>
     </div>
     <div ng-if="analytic.tabShowReport">
-        <div ng-if="usage.costGridOptions.data.length >0" ui-grid="usage.costGridOptions" ui-grid-selection ui-grid-exporter ui-grid-auto-resize class="grid"></div>
-        <div ng-if="!usage.costGridOptions.data.length >0">
+        <div ng-if="usage.costGridOptions.data.length > 0" ui-grid="usage.costGridOptions" ui-grid-selection ui-grid-exporter ui-grid-auto-resize class="grid"></div>
+        <div ng-if="!usage.costGridOptions.data.length > 0">
             <div class="alert alert-warning">
                 No Data Available.
             </div>
diff --git a/client/cat3/src/partials/sections/dashboard/dashboardCtrl.js b/client/cat3/src/partials/sections/dashboard/dashboardCtrl.js
index 0e36f880c..5b9d187e9 100644
--- a/client/cat3/src/partials/sections/dashboard/dashboardCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/dashboardCtrl.js
@@ -31,21 +31,5 @@
             $state.go('dashboard.settings');
         }
     }
-            $rootScope.hideTreeOverlay = function () {
-                $rootScope.showTreeMenu = false;
-                $(".panelRight").css("width", "calc(100% - 39px)");
-                $("#navigPage").addClass("tree-close");
-                $(".minifyme").css("left", "0px");
-                $(".minifyme").css("border-radius", "0px");
-                $(".minifyme").css("width", "35px");
-        };
-            $rootScope.showTreeOverlay = function () {
-                $rootScope.showTreeMenu = true;
-                $(".panelRight").css("width", "calc(100% - 258px)");
-                $("#navigPage").removeClass("tree-close");
-                $(".minifyme").css("left", "216px");
-                $(".minifyme").css("width", "38px");
-                $(".minifyme").css("border-radius", "5px 0 0 5px");
-        };
 }]);
 })(angular);
\ No newline at end of file
diff --git a/client/cat3/src/partials/sections/dashboard/design/controllers/appUrlCreateCtrl.js b/client/cat3/src/partials/sections/dashboard/design/controllers/appUrlCreateCtrl.js
new file mode 100644
index 000000000..289f94e82
--- /dev/null
+++ b/client/cat3/src/partials/sections/dashboard/design/controllers/appUrlCreateCtrl.js
@@ -0,0 +1,16 @@
+(function (angular) {
+    "use strict";
+    angular.module('dashboard.design')
+        .controller('appUrlCreateCtrl',['$scope', '$modalInstance', function ($scope,$modalInstance) {
+           $scope.cancel = function() {
+                $modalInstance.dismiss('cancel');
+            };
+            $scope.ok=function(){
+                $scope.appUrls = {
+                    name: $scope.appUrlItem.name,
+                    url: $scope.appUrlItem.url
+                };
+                $modalInstance.close($scope.appUrls);    
+            };
+    }]);
+})(angular);
\ No newline at end of file
diff --git a/client/cat3/src/partials/sections/dashboard/design/controllers/blueprintCreateCtrl.js b/client/cat3/src/partials/sections/dashboard/design/controllers/blueprintCreateCtrl.js
new file mode 100644
index 000000000..e49a69e57
--- /dev/null
+++ b/client/cat3/src/partials/sections/dashboard/design/controllers/blueprintCreateCtrl.js
@@ -0,0 +1,509 @@
+(function (angular) {
+    "use strict";
+    angular.module('dashboard.design')
+        .controller('blueprintCreateCtrl',['$scope','$modal','toastr','$state', 'blueprintCreateService','confirmbox', function ($scope,$modal,toastr,$state,bpCreateSer,confirmbox) {
+            var blueprintCreation = this;
+            //to get the templates listing.
+            if($state.params && $state.params.subItem && $state.params.templateObj){
+                $scope.providerType = $state.params.subItem.toUpperCase();
+                $scope.bpTypeName = $state.params.templateObj.templatetypename;
+            }
+            $scope.logo = 'images/global/cat-logo.png';
+            $scope.osImageLogo = 'images/global/linux.png';
+            $scope.isOSImage = false;
+            $scope.imageList = [];
+            //on initial load.
+            $scope.nextEnabled = false;
+            $scope.previousEnabled = false;
+            $scope.isNextVisible = true;
+            $scope.isSubmitVisible = false;
+            /*Open only One Accordian-Group at a time*/
+            $scope.oneAtATime = true;
+            /*Initialising First Accordian-group open on load*/
+            $scope.isFirstOpen = true;
+            if( $scope.bpTypeName === 'Composite'){
+                $scope.isNextVisible = false;
+                $scope.isSubmitComposite = true;
+            }
+            blueprintCreation.newEnt = [];
+            blueprintCreation.osListing = [];
+            blueprintCreation.providerListing = [];
+            blueprintCreation.imageListing = [];
+            blueprintCreation.regionListing = ''; 
+            blueprintCreation.keyPairListing = '';
+            blueprintCreation.vpcListing = [];
+            blueprintCreation.subnetListing = [];
+            blueprintCreation.securityGroupListing = [];
+            blueprintCreation.instanceType = [];
+            blueprintCreation.orgBUProjListing = [];
+            blueprintCreation.buProjListing = [];
+            blueprintCreation.projListing = [];
+            blueprintCreation.appUrlList = [];
+            blueprintCreation.getCFTDetails = [];
+            blueprintCreation.providerListingAzure = [];
+            blueprintCreation.regionListingAzure = []; 
+            blueprintCreation.subnetListingAzure = [];
+            blueprintCreation.dataStore = [];
+
+            blueprintCreation.templateListing = function(){
+                bpCreateSer.getTemplates().then(function(data){
+                    $scope.templateList = data;    
+                });
+            };
+
+            $scope.blueprintTemplateClick = function(templateDetail) {
+                templateDetail.selected = true;
+                $scope.nextEnabled = true;
+                $scope.templateSelected = templateDetail; 
+            };
+
+            blueprintCreation.getImages = function(){
+                bpCreateSer.getImages().then(function(data){
+                    //Note: The provider type should come in lowercase from the API.
+                    var providerType = $scope.providerType.toLowerCase();
+                    for(var i=0;i<data.length;i++){
+                        if(providerType === data[i].providerType){
+                            $scope.imageList.push(data[i]);        
+                        }
+                    }
+                });
+            };
+
+            if($scope.bpTypeName === 'OSImage'){
+                blueprintCreation.getImages();
+            } else {
+                blueprintCreation.templateListing();
+            }
+
+            blueprintCreation.getOperatingSytems = function(){
+                $scope.isOSLoading = true;
+                bpCreateSer.getOperatingSytems().then(function(data){
+                    blueprintCreation.osListing = data;
+                    if($scope.bpTypeName === 'OSImage'){
+                        blueprintCreation.newEnt.osListing = $scope.templateSelected.osType;
+                        $scope.isOSImage = true;
+                    }
+                    $scope.isOSLoading = false;
+                });
+            };
+
+            blueprintCreation.getAllProviders = function(){
+                if($scope.providerType === 'AWS'){
+                    bpCreateSer.getAWSProviders().then(function(data){
+                        blueprintCreation.providerListing = data;
+                    });    
+                } else if($scope.providerType === 'AZURE'){
+                    bpCreateSer.getAzureProviders().then(function(data){
+                        blueprintCreation.providerListing = data;
+                    });    
+                } else if($scope.providerType === 'OPENSTACK'){
+                    bpCreateSer.getOpenStackProviders().then(function(data){
+                        blueprintCreation.providerListing = data;
+                    });
+                } else if($scope.providerType === 'VMWARE'){
+                    bpCreateSer.getVmWareProviders().then(function(data){
+                        blueprintCreation.providerListing = data;
+                    });
+                }
+                if($scope.bpTypeName === 'OSImage'){
+                    blueprintCreation.newEnt.providers = $scope.templateSelected.providerId;
+                    $scope.isOSImage = true;
+                    blueprintCreation.getProviderImage();
+                }
+            };
+
+            blueprintCreation.getProviderImage = function(){
+                $scope.isImageLoading = true;
+                $scope.isRegionKeyPairLoading = true;      
+                bpCreateSer.getImageLists(blueprintCreation.newEnt.providers).then(function(data){
+                    if(blueprintCreation.newEnt.providers){
+                        blueprintCreation.imageListing = data;
+                        if($scope.bpTypeName === 'OSImage'){
+                            blueprintCreation.newEnt.images = $scope.templateSelected._id;
+                            $scope.isOSImage = true;
+                            blueprintCreation.getInstanceType();
+                        }
+                        $scope.isImageLoading = false;
+                        blueprintCreation.instanceCount = function(max, step) {
+                            step = step || 1;
+                            var input = [];
+                            for (var i = 1; i <= max; i += step) {
+                                input.push(i);
+                            }
+                            return input;
+                        };
+                    }
+                });
+                if($scope.providerType === 'AWS'){
+                    bpCreateSer.getAWSProviderWithId(blueprintCreation.newEnt.providers).then(function(data){
+                        if(blueprintCreation.newEnt.providers){
+                            blueprintCreation.regionListing = data.keyPairs[0].region;
+                            blueprintCreation.keyPairListing = data.keyPairs[0].keyPairName;
+                            $scope.isRegionKeyPairLoading = false;
+                        }
+                    });    
+                } else if($scope.providerType === 'AZURE'){
+                    bpCreateSer.getAzureLocations(blueprintCreation.newEnt.providers).then(function(data){
+                        if(blueprintCreation.newEnt.providers){
+                            blueprintCreation.regionListingAzure = data.Locations.Location;
+                            $scope.isRegionKeyPairLoading = false;
+                        }
+                    })
+                } else if($scope.providerType === 'VMWARE'){
+                    bpCreateSer.getProviderDataStore(blueprintCreation.newEnt.providers).then(function(data){
+                           if(blueprintCreation.newEnt.providers){
+                            blueprintCreation.dataStore = data.datastores;
+                            $scope.isRegionKeyPairLoading = false;
+                        }
+                    })
+                }
+                
+            };
+
+            blueprintCreation.getInstanceType = function(){
+                var imageDetails = blueprintCreation.imageListing;
+                for(var i= 0; i<imageDetails.length;i++){
+                    if(blueprintCreation.newEnt.images === imageDetails[i]._id){
+                        $scope.imageIdentifier = imageDetails[i].imageIdentifier; 
+                    }
+                }
+                if($scope.providerType === 'AWS'){
+                    $scope.isInstanceTypeLoading = true;
+                    bpCreateSer.getInstanceType().then(function(data){
+                        if(blueprintCreation.newEnt.images){
+                            blueprintCreation.instanceType = data;    
+                            $scope.isInstanceTypeLoading = false;
+                        }
+                    });
+                }
+            };    
+
+            blueprintCreation.listVpcs = function(){
+                $scope.isVPCLoading = true;
+                if($scope.providerType === 'AWS'){
+                    bpCreateSer.postVpcs(blueprintCreation.newEnt.providers,blueprintCreation.newEnt.region).then(function(data){
+                        if(blueprintCreation.newEnt.region){
+                            blueprintCreation.vpcListing = data.Vpcs;    
+                            $scope.isVPCLoading = false;
+                        }
+                    });    
+                } else if($scope.providerType === 'AZURE'){
+                    bpCreateSer.getAzureVPC(blueprintCreation.newEnt.providers).then(function(data){
+                        if(blueprintCreation.newEnt.region){
+                            var azureVpc = data.VirtualNetworkSites.VirtualNetworkSite;
+                            for(var i =0; i<azureVpc.length;i++){
+                                if(blueprintCreation.newEnt.region === azureVpc[i].Location){
+                                    blueprintCreation.vpcListing.push(azureVpc[i]);
+                                    $scope.isVPCLoading = false;        
+                                }
+                            }
+                        }
+                    });
+                    var regionInstanceType = blueprintCreation.regionListingAzure;
+                    for(var i=0;i<regionInstanceType.length;i++){
+                        if(blueprintCreation.newEnt.region === regionInstanceType[i].Name){
+                            blueprintCreation.instanceType = regionInstanceType[i].ComputeCapabilities.VirtualMachinesRoleSizes.RoleSize;
+                            console.log(blueprintCreation.instanceType);
+                            $scope.isInstanceTypeLoading = false;
+                        }
+                    }
+                }
+            };
+
+            blueprintCreation.postSubnets = function() {
+                $scope.isSubnetLoading = true;
+                if($scope.providerType === 'AWS'){
+                    bpCreateSer.postSubnets(blueprintCreation.newEnt.vpcId,blueprintCreation.newEnt.providers,blueprintCreation.newEnt.region).then(function(data){
+                        if(blueprintCreation.newEnt.vpcId){
+                            blueprintCreation.subnetListing = data.Subnets;
+                            $scope.isSubnetLoading = false;
+                        }    
+                    });    
+                } else if($scope.providerType === 'AZURE'){
+                    var subnetsAzure = blueprintCreation.vpcListing;
+                    for(var i =0;i<subnetsAzure.length;i++){
+                        if(blueprintCreation.newEnt.vpcId === subnetsAzure[i].Id){
+                            blueprintCreation.subnetListingAzure = subnetsAzure[i].Subnets.Subnet;
+                            $scope.isSubnetLoading = false;
+                        }  
+                    }
+                }
+            };    
+            
+            if($scope.providerType === 'AWS'){
+                blueprintCreation.postSecurityGroups = function() {
+                    $scope.isSecurityGroupLoading = true;
+                    bpCreateSer.postSecurityGroups(blueprintCreation.newEnt.vpcId,blueprintCreation.newEnt.providers,blueprintCreation.newEnt.region).then(function(data){
+                        if(blueprintCreation.newEnt.vpcId){
+                            blueprintCreation.securityGroupListing = data;
+                            $scope.isSecurityGroupLoading = false;
+                        }    
+                    });
+                };    
+            }
+            
+
+            blueprintCreation.getOrgBUProjDetails = function() {
+                bpCreateSer.getOrgBuProj().then(function(data){
+                    blueprintCreation.orgBUProjListing = data;
+                });
+            };
+
+            blueprintCreation.getBG = function() {
+                if(blueprintCreation.newEnt.orgList) {
+                    var buProjDetails = blueprintCreation.orgBUProjListing;
+                    blueprintCreation.bgListing = buProjDetails;
+                }
+                blueprintCreation.getChefServer();
+            };
+
+            blueprintCreation.getProject = function() {
+                if(blueprintCreation.newEnt.orgList && blueprintCreation.newEnt.orgList) {
+                    var buProjDetails = blueprintCreation.orgBUProjListing;
+                    blueprintCreation.projListing = buProjDetails;
+                }
+            };
+
+            blueprintCreation.enableAppDeploy = function() {
+                if(blueprintCreation.newEnt.projectList) {
+                    $scope.showRepoServerName = true;
+                }
+            };
+
+            blueprintCreation.selectServer = function() {
+                if(blueprintCreation.newEnt.nexusDockerServer) {
+                    $scope.showRepoDetails = true;
+                }
+            };
+
+            blueprintCreation.getChefServer = function() {
+                bpCreateSer.getChefServer().then(function(data){
+                    for(var i =0;i<data.length;i++){
+                        if(blueprintCreation.newEnt.orgList === data[i].orgname_rowid[0]){
+                            $scope.getChefServerId = data[i].rowid;
+                        }
+                    }
+                });
+            }; 
+
+            blueprintCreation.getCFTParams = function() {
+                $scope.cftTemplate = $scope.templateSelected;
+                $scope.cftTemplate = $scope.templateSelected.rowid + "__template__" + $scope.templateSelected.template_filename;
+                bpCreateSer.getCFTParams($scope.cftTemplate).then(function(data){
+                    blueprintCreation.getCFTDetails = data;
+                    blueprintCreation.newEnt.cftModel = data.Parameters;
+                    blueprintCreation.newEnt.cftModelResources = {};
+                });
+            };                                             
+
+            //wizard data setting for step 1 and step 2.
+            var index = 0, // points to the current step in the steps array
+            steps = $scope.steps = [{
+                'isDisplayed': true,
+                'name': 'choose templates',
+                'title': 'Choose Templates'
+            }, {
+                'isDisplayed': false,
+                'name': 'Create Blueprint',
+                'title': 'Create Blueprint'
+            }];
+
+            if($scope.bpTypeName === "Docker" || $scope.bpTypeName === "CloudFormation"){
+                $scope.isOrgOpen = true;    
+            } else {
+                $scope.isOrgOpen = false;    
+            }
+            
+            angular.extend($scope, {
+                /* Moves to the next step*/
+                next : function () {
+                    if (steps.length === 0) {
+                        return;
+                    }
+                    // If we're at the last step, then stay there.
+                    if (index === steps.length - 1) {
+                        return;
+                    }
+                    steps[index++].isDisplayed = false;
+                    steps[index].isDisplayed = true;
+                    $scope.setButtons();
+                },
+                /* Moves to the previous step*/
+                previous : function () {
+                    if (steps.length === 0) {
+                        return;
+                    }
+                    if (index === 0) {
+                        return;
+                    }
+                    steps[index--].isDisplayed = false;
+                    steps[index].isDisplayed = true;
+                    $scope.setButtons();
+                },
+                /* Sets the correct buttons to be enabled or disabled.*/
+                setButtons : function() {
+                    if (index === steps.length - 1) {
+                        $scope.isFirstOpen = true;
+                        $scope.isOrgOpen = true;
+                        $scope.isNextVisible = false;
+                        $scope.previousEnabled = true;
+                        $scope.isSubmitVisible = true;
+                        blueprintCreation.getOperatingSytems();
+                        blueprintCreation.getAllProviders();    
+                        blueprintCreation.getOrgBUProjDetails();
+                        if($scope.bpTypeName === 'CloudFormation'){
+                            blueprintCreation.getCFTParams();
+                        }  
+                    } else if (index === 0) {
+                        $scope.isNextVisible = true;
+                        $scope.isSubmitVisible = false;
+                        $scope.showRepoServerName = false;
+                        $scope.showRepoDetails = false;
+                        //disabling the card selected state.
+                        $scope.templateSelected.selected = false;
+                        $scope.previousEnabled = false;
+                        $scope.nextEnabled = false;
+                    } else {
+                        $scope.nextEnabled = true;
+                        $scope.previousEnabled = true;
+                    }
+                },
+                createAppUrl : function() {
+                $modal.open({
+                        animation: true,
+                        templateUrl: 'src/partials/sections/dashboard/workzone/instance/manage/popups/applicationUrl.html',
+                        controller: 'appUrlCreateCtrl',
+                        backdrop: 'static',
+                        keyboard: false
+                    }).result.then(function(appUrlItem) {
+                        blueprintCreation.appUrlList.push(appUrlItem);
+                    }, function() {
+                    });
+                },
+                removeAppUrl : function(appUrl) {
+                    var idx = blueprintCreation.appUrlList.indexOf(appUrl);
+                    blueprintCreation.appUrlList.splice(idx,1); 
+                },
+                submit : function() {
+                    var blueprintCreateJSON = {
+                        templateComponents: 'component0',
+                        dockercontainerpathstitle: '',
+                        dockerlaunchparameters: '',
+                        dockerreponame: '',
+                        dockercompose : [],
+                        chefServerId:$scope.getChefServerId,
+                        instanceType:blueprintCreation.newEnt.instanceType,
+                        instanceOS:blueprintCreation.newEnt.osListing,
+                        instanceAmiid:$scope.imageIdentifier,
+                        instanceUsername:'root',
+                        dockerimagename:'',
+                        orgId:blueprintCreation.newEnt.orgList,
+                        bgId:blueprintCreation.newEnt.bgList,
+                        projectId:blueprintCreation.newEnt.projectList,
+                        keyPairId:blueprintCreation.newEnt.keyPair,
+                        vpcId:blueprintCreation.newEnt.vpcId,
+                        subnetId:blueprintCreation.newEnt.subnetId,
+                        imageId:blueprintCreation.newEnt.images,
+                        providerId:blueprintCreation.newEnt.providers,
+                        region:blueprintCreation.newEnt.region,
+                        templateType:$state.params.templateObj.templatetype,
+                        name:blueprintCreation.newEnt.blueprintName
+                    };
+
+                    if($scope.bpTypeName === 'OSImage'){
+                        blueprintCreateJSON.templateId = $scope.templateSelected.name;
+                    } else {
+                        blueprintCreateJSON.templateId = $scope.templateSelected.templatename;
+                    }
+
+                    if($scope.bpTypeName === 'OSImage' || $scope.bpTypeName === 'SoftwareStack') {
+                        if($scope.providerType === 'AWS'){
+                            blueprintCreateJSON.blueprintType = 'instance_launch';
+                            blueprintCreateJSON.instanceCount = blueprintCreation.newEnt.instanceCount;    
+                        } else if($scope.providerType === 'AZURE'){
+                            blueprintCreateJSON.blueprintType = 'azure_launch';
+                            blueprintCreateJSON.instanceCount = blueprintCreation.newEnt.instanceCount;
+                        } else if($scope.providerType === 'VMWARE'){
+                            blueprintCreateJSON.blueprintType = 'vmware_launch';
+                            blueprintCreateJSON.instanceCount = '1';
+                            //not required as it is already getting used. Need to check for new API.
+                            blueprintCreateJSON.instanceImageName = $scope.imageIdentifier;
+                            blueprintCreateJSON.datastore = blueprintCreation.newEnt.dataStore;        
+                        } else if($scope.providerType === 'OPENSTACK'){
+                            blueprintCreateJSON.blueprintType = 'openstack_launch';
+                            blueprintCreateJSON.instanceCount = '1';
+                        }
+                    }
+
+                    if($scope.bpTypeName === 'CloudFormation'){
+                        var cftParameters = [];
+                        angular.forEach(blueprintCreation.newEnt.cftModel , function(value, key) {
+                            var parameterObj = {
+                                ParameterKey: key,
+                                ParameterValue: value.Default
+                            }
+                            cftParameters.push(parameterObj);
+                            blueprintCreateJSON.cftStackParameters = cftParameters;
+                            blueprintCreateJSON.blueprintType = "aws_cf";
+                        });
+                        blueprintCreateJSON.cftTemplateFile = $scope.cftTemplate;
+                        var cftInstances = [];
+                        angular.forEach(blueprintCreation.newEnt.cftModelResources , function(value, key) {
+                            var instanceObj = {
+                                logicalId: key,
+                                username: value,
+                                runlist: []
+                            };
+                            cftInstances.push(instanceObj);
+                            blueprintCreateJSON.cftInstances = cftInstances;
+                        });
+                    }
+
+                    blueprintCreateJSON.runlist = [];
+                    if($scope.templateSelected.templatescookbooks){
+                        blueprintCreateJSON.runlist = $scope.templateSelected.templatescookbooks.split(',');    
+                    }
+                    if($scope.providerType === 'AWS'){
+                        blueprintCreateJSON.securityGroupIds = [];
+                        for(var i =0;i<blueprintCreation.securityGroupListing.length;i++){
+                            if(blueprintCreation.securityGroupListing[i]._isChecked){
+                                blueprintCreateJSON.securityGroupIds.push(blueprintCreation.securityGroupListing[i].GroupId);
+                            }
+                        }    
+                    }
+                    
+                    if(blueprintCreation.appUrlList && blueprintCreation.appUrlList.length){
+                        blueprintCreateJSON.appUrls = blueprintCreation.appUrlList;
+                    }
+                    if($scope.providerType === 'AZURE'){
+                        blueprintCreateJSON.securityGroupPorts = blueprintCreation.newEnt.blueprintSecurityGroupPort;
+                    }
+                    var reqBody = {
+                        blueprintData: blueprintCreateJSON
+                    };
+                    var modalOptions = {
+                        closeButtonText: 'Cancel',
+                        actionButtonText: 'Submit',
+                        actionButtonStyle: 'bp-btn-create',
+                        headerText: 'Confirm Blueprint Creation',
+                        bodyText: 'Are you sure want to submit this Blueprint Data? Press Ok to Continue'
+                    };
+                    confirmbox.showModal({}, modalOptions).then(function() {
+                        bpCreateSer.postBlueprintSave(blueprintCreateJSON.orgId,blueprintCreateJSON.bgId,blueprintCreateJSON.projectId,reqBody).then(function(){
+                            if($scope.bpTypeName === 'OSImage'){
+                                toastr.success('OSImage Blueprint Created Successfully');
+                            } else if($scope.bpTypeName === 'SoftwareStack') {
+                                toastr.success('Software Blueprint Created Successfully');
+                            } else if($scope.bpTypeName === 'CloudFormation') {
+                                toastr.success('CFT Blueprint Created Successfully');
+                            } else {
+                                toastr.success('Docker Blueprint Created Successfully');
+                            }
+                        }, function(data) {
+                            toastr.error('error:: ' + data.toString());
+                        });
+                    });
+                } 
+            });
+    }]);
+})(angular);
\ No newline at end of file
diff --git a/client/cat3/src/partials/sections/dashboard/design/controllers/blueprintListCtrl.js b/client/cat3/src/partials/sections/dashboard/design/controllers/blueprintListCtrl.js
new file mode 100644
index 000000000..e15983415
--- /dev/null
+++ b/client/cat3/src/partials/sections/dashboard/design/controllers/blueprintListCtrl.js
@@ -0,0 +1,100 @@
+(function (angular) {
+    "use strict";
+    angular.module('dashboard.design')
+        .controller('blueprintListCtrl',['$scope','$rootScope','$state','$modal','toastr','blueprintService','genericServices', function ($scope,$rootScope,$state,$modal,toastr,bpServ,gencSers) {
+            var pbList = this;
+            pbList.blueprintList={
+                list:[],
+                card:[]
+            };
+            pbList.viewTypeList=true;
+            pbList.selectedCards=[];
+            pbList.blueprintType=$state.params.templateName;
+            pbList.createList = function (){
+                var getResult = bpServ.createList();
+                if(getResult){
+                    getResult.then(function (result){
+                        pbList.blueprintList.card=result.blueprints;
+                        pbList.pager=result.metaData;
+                        pbList.blueprintList.list.data=result.blueprints;
+                        pbList.blueprintList.list.paginationPageSizes= [10, 20, 30];
+                        pbList.blueprintList.list.paginationPageSize= 10;
+                        pbList.blueprintList.list.enableGridMenu = true;
+                        pbList.blueprintList.list.enableSorting= false;
+                        pbList.blueprintList.list.columnDefs = [
+                            { name:'Name',minWidth:150,field:'name' },
+                            { name:'Name',minWidth:150,field:'name' },
+                            { name:'InstanceOs',minWidth:150,cellTemplate:''},
+                            { name:'vpcId',minWidth:150,cellTemplate:''},
+                            { name:'Region',minWidth:150,cellTemplate:'',visible: false},
+                            { name:'Operating System',minWidth:150,cellTemplate:'',visible: false},
+                            { name:'Instance Type',minWidth:150,cellTemplate:''},
+                            { name:'Image',minWidth:150,cellTemplate:'',visible: false},
+                            { name:'Keypair',minWidth:150,cellTemplate:'',visible: false},
+                            { name:'Subnet',minWidth:150,cellTemplate:'',visible: false},
+                            { name:'Security Group',width:150,cellTemplate:''},
+                            { name:'Runlist',minWidth:150,cellTemplate:''},
+                            { name:'Action',minWidth:150,cellTemplate:'<span class="badge cat-btn-update" title="Clone"><i class="fa fa-clone fa-2 white" aria-hidden="true"></i></span> ' +
+                            '&nbsp; <span class="badge cat-btn-update" title="Info" ng-click="grid.appScope.blueprintInfo($event,row.entity,null);"><i class="fa fa-info fa-2 white" aria-hidden="true"></i></span>' +
+                            '&nbsp; <span class="badge cat-btn-update" title="Delete"  ng-click="grid.appScope.deleteBp(row.entity._id);"><i class="fa fa-trash-o fa-2 white" aria-hidden="true"></i></span>' +
+                            '&nbsp; <span class="badge cat-btn-update" title="Launch"  ng-click="grid.appScope.cloneBlueprint($event,row.entity._id);"><i class="fa fa-location-arrow fa-2 white" aria-hidden="true"></i></span>'}
+                        ];
+                    });
+                }
+            };
+            pbList.blueprintInfo = $scope.blueprintInfo =function($event,bpDetails,bpType){
+                $event.stopPropagation();
+                gencSers.moreInfo(bpDetails,bpType);
+            };
+            pbList.launchInstance  = $scope.launchInstance =function($event,pbId){
+                $event.stopPropagation();
+                bpServ.launchBp(pbId);
+            };
+            pbList.selectCard = function (cardObj){
+                pbList[cardObj._id] = !pbList[cardObj._id];
+                if(pbList.selectedCards.indexOf(cardObj._id) === -1){
+                    pbList.selectedCards.push(cardObj._id);
+                } else {
+                    pbList.selectedCards.splice(pbList.selectedCards.indexOf(cardObj._id),1);
+                }
+
+            };
+            pbList.copyBp = $scope.copyBp =function(ids){
+                bpServ.copyBp(ids);
+            };
+            pbList.deleteBp = $scope.deleteBp =function(ids){
+                bpServ.deleteBp(ids);
+            };
+            pbList.cloneBlueprint = $scope.cloneBlueprint =function($event,pbId){
+                $event.stopPropagation();
+                $rootScope.stateItems.current.params.blueId=pbId;
+                $state.go('dashboard.designSubView',{subItem:$state.params.subItem,view:'edit'});
+
+            };
+            pbList.createList();
+    }]).controller('bpLaunchInstanceCtrl',['$rootScope','$modalInstance',function ($rootScope,$modalInstance) {
+        var lanIns = this;
+        lanIns.newEnt=[];
+        if($rootScope.organObject){
+            lanIns.envOptions=$rootScope.organObject[$rootScope.organNewEnt.org].environments;
+            lanIns.newEnt.org =$rootScope.organObject[$rootScope.organNewEnt.org].name;
+            lanIns.newEnt.buss=$rootScope.organObject[$rootScope.organNewEnt.org].businessGroups[$rootScope.organNewEnt.buss].name;
+            lanIns.newEnt.proj=$rootScope.organObject[$rootScope.organNewEnt.org].businessGroups[$rootScope.organNewEnt.buss].projects[$rootScope.organNewEnt.proj].name;
+        }
+        lanIns.launch = function (){
+            $modalInstance.close(lanIns.newEnt.env);
+        };
+    }]).controller('bpCopyCtrl',['$rootScope','$modalInstance',function ($rootScope,$modalInstance) {
+        var bpCopy = this;
+        bpCopy.newEnt=[];
+        bpCopy.newEnt.copyOrg='0';
+        bpCopy.newEnt.copyBuss='0';
+        bpCopy.newEnt.copyProj='0';
+        bpCopy.cancel = function (){
+            $modalInstance.dismiss('cancel');
+        };
+        bpCopy.copySelectedBlueprint = function (){
+            $modalInstance.close(bpCopy.newEnt);
+        };
+    }]);
+})(angular);
\ No newline at end of file
diff --git a/client/cat3/src/partials/sections/dashboard/design/controllers/createCompositeCtrl.js b/client/cat3/src/partials/sections/dashboard/design/controllers/createCompositeCtrl.js
new file mode 100644
index 000000000..92345cd45
--- /dev/null
+++ b/client/cat3/src/partials/sections/dashboard/design/controllers/createCompositeCtrl.js
@@ -0,0 +1,78 @@
+(function (angular) {
+    "use strict";
+    angular.module('dashboard.design')
+        .controller('createCompositeCtrl',['$scope','$rootScope','$state','toastr','blueprintService','genericServices','designServices', function ($scope,$rootScope,$state,toastr,bpServ,gencSers,designServices) {
+            var createCBP = this;
+            createCBP.ExBlueprintList=[];
+            createCBP.SelectedBPList=[];
+            createCBP.selectBlueprintId='';
+            createCBP.selectedBPDetails='';
+            createCBP.compositeBPType='chef';
+            createCBP.onSubmit =false;
+            createCBP.newEnt={
+                bpName:''
+            };
+            createCBP.createList = function (){
+                createCBP.ExBlueprintList=[];
+                createCBP.SelectedBPList=[];
+                var getResult = bpServ.createList(createCBP.compositeBPType);
+                if(getResult){
+                    getResult.then(function (result){
+                        createCBP.ExBlueprintList=result;
+                    });
+                }
+            };
+            createCBP.addBP = function (indexArr){
+                createCBP.SelectedBPList.push(createCBP.ExBlueprintList[indexArr]);
+                createCBP.ExBlueprintList.splice(indexArr,1);
+            };
+            createCBP.deSelect =function ($event,indexArr){
+                $event.stopPropagation();
+                createCBP.ExBlueprintList.push(createCBP.SelectedBPList[indexArr]);
+                if(createCBP.SelectedBPList[indexArr]._id === createCBP.selectBlueprintId){
+                    createCBP.selectBlueprintId='';
+                    createCBP.selectedBPDetails='';
+                }
+                createCBP.SelectedBPList.splice(indexArr,1);
+
+            };
+            createCBP.selectBpInfo  =function ($event,bpDetails){
+                $event.stopPropagation();
+                gencSers.moreInfo(bpDetails,null);
+            };
+            createCBP.editSelectBpInfo  =function ($event,bpDetails){
+                createCBP.selectBlueprintId=bpDetails._id;
+                createCBP.selectedBPDetails=bpDetails;
+            };
+            createCBP.ord  =function (){
+                console.log(createCBP.selectedBpOrder);
+            };
+            $rootScope.compositeSave =function (vali) {
+                createCBP.onSubmit =true;
+                if(!createCBP.newEnt.bpName  || !createCBP.SelectedBPList.length > 0){
+                    return true;
+                }
+                if($rootScope.organObject){
+                    createCBP.newEnt.org =$rootScope.organObject[$rootScope.organNewEnt.org].rowid;
+                    createCBP.newEnt.buss=$rootScope.organObject[$rootScope.organNewEnt.org].businessGroups[$rootScope.organNewEnt.buss].rowid;
+                    createCBP.newEnt.proj=$rootScope.organObject[$rootScope.organNewEnt.org].businessGroups[$rootScope.organNewEnt.buss].projects[$rootScope.organNewEnt.proj].rowid;
+                }
+                var params = {
+                    url: '/composite-blueprints/',
+                    data:{
+                        "name": createCBP.newEnt.bpName,
+                        "organizationId":createCBP.newEnt.org,
+                        "businessGroupId": createCBP.newEnt.buss,
+                        "projectId":createCBP.newEnt.proj,
+                        "blueprints": createCBP.SelectedBPList,
+                        "cloudProviderType": 'aws'
+                    }
+                };
+                designServices.promisePost(params).then(function () {
+                    toastr.success('Successfully Created.');
+                    $state.go('dashboard.designSubView',{subItem:$state.params.subItem,view:'list'});
+                });
+            };
+            createCBP.createList();
+    }]);
+})(angular);
diff --git a/client/cat3/src/partials/sections/dashboard/design/data/providers.json b/client/cat3/src/partials/sections/dashboard/design/data/providers.json
new file mode 100644
index 000000000..457f16c69
--- /dev/null
+++ b/client/cat3/src/partials/sections/dashboard/design/data/providers.json
@@ -0,0 +1,30 @@
+[
+  {
+    "name": "AWS",
+    "parent": "design",
+    "abstract": true,
+    "icon":"aws.png",
+    "filterArray":["arm"]
+  },
+  {
+    "name": "AZURE",
+    "parent": "design",
+    "abstract": true,
+    "icon":"openstak.png",
+    "filterArray":["cft","composite"]
+  },
+  {
+    "name": "OPENSTACK",
+    "parent": "design",
+    "abstract": true,
+    "icon":"azure-card.png",
+    "filterArray":["cft","arm","composite"]
+  },
+  {
+    "name": "VMWARE",
+    "parent": "design",
+    "abstract": true,
+    "icon":"vmware-card.png",
+    "filterArray":["cft","arm","composite"]
+  }
+]
\ No newline at end of file
diff --git a/client/cat3/src/partials/sections/dashboard/design/design.html b/client/cat3/src/partials/sections/dashboard/design/design.html
index 6103062cb..6e487d836 100644
--- a/client/cat3/src/partials/sections/dashboard/design/design.html
+++ b/client/cat3/src/partials/sections/dashboard/design/design.html
@@ -1,3 +1,71 @@
-<div>
-	<strong>{{Text}}</strong>
+<div id="analyticsPage" class='fluid-container'>
+	<div class='col-xs-12 col-sm-12 col-md-12 col-lg-12 panelLeft no-padding'>
+		<link rel="stylesheet" type="text/css" href="catalyst/partials/sections/dashboard/analytics/view/analyticsTreeMenu.css"/>
+		<link rel="stylesheet" type="text/css" href="catalyst/partials/globals/treeComponent/treeDirective.css"/>
+
+		<div id='analyticsTreeMenuPage'>
+			<div id='navigPage' ng-mouseover="showTreeOverlay()" ng-mouseleave="hideTreeOverlay()" ng-class="{'show-left-tree':showTree}">
+				<div id='navigPage-inner'>
+					<div id="treeParent">
+						<ul class="tree-ul">
+							<li  ng-repeat="provider in desCtrl.providersMenu">
+								<div class="liContents">
+									<i class="icon fa fa-building label-spacing"></i>
+									<span>{{provider.name}}</span>
+									<div data-ng-hide="node.collapsed" data-tree-id="relevancelab" data-analytics-tree-model="node.nodes" data-node-id="rowid" data-node-label="text" data-node-children="nodes">
+										<ul class="tree-ul">
+											<li ng-repeat='tempType in desCtrl.templateTypes | inArray:provider.filterArray:"templatetype"' ui-sref="dashboard.design.list({provider:provider.name,templateObj:tempType})" class="pointer-cursor" >
+												<div class="liContents">
+													<div class="liContents-wrapper">
+														<i class="icon fa fa-money label-spacing"></i>
+														<span>{{tempType.templatetypename}}</span>
+														<i class="caret-spacing fa fa-caret-left pull-right" ng-show="stateItems.filterView.cost"></i>
+													</div>
+												</div>
+											</li>
+										</ul>
+									</div>
+								</div>
+							</li>
+						</ul>
+					</div>
+				</div>
+			</div>
+		</div>
+</div>
+	<div id="sidebar-wrapper" ng-class="{'show-wrapper':isOpenSidebar === true}">
+		<form>
+			<div>
+				<div class="repo-job-details-wrapper-inner marginbottom10"  >Filter:</div>
+
+				<div class="col-lg-12 col-md-12 form-group" ng-show="stateItems.filterView.org">
+					<label for="">Organization</label>
+					<select  ng-model="organNewEnt.org" class="chooseProjectExisting width-100 form-control"  ng-change="getProviders(organObject[organNewEnt.org].rowid)">
+						<option value="">Select</option>
+						<option ng-repeat="org in organObject"  value="{{organObject.indexOf(org)}}" >{{org.name}}</option>
+					</select>
+				</div>
+				<div class="col-lg-12 col-md-12 marginbottom5">
+					<button type="button" class="btn btn-primary" ng-click="applyFilter(true,filterNewEnt.period);isOpenSidebar=false;"><i class="fa fa-filter fa-2 white" aria-hidden="true"></i>&nbsp;Apply</button>
+					<button type="button" class="btn btn-default" ng-click="applyFilter(false,filterNewEnt.period);isOpenSidebar=false;"><i class="fa fa-times fa-2" aria-hidden="true"></i>&nbsp;Clear</button>
+				</div>
+			</div>
+		</form>
+		<br/>
+	</div>
+
+	<div class="panelRight">
+		<div id='rightPanel' class='container-fluid'>
+			<ul class="nav nav-tabs" >
+				<li ng-class="{'active':analytic.tabShowChat === true}"><a ng-click="tabShow(true,false)"  ><i class="fa fa-area-chart fa-2" aria-hidden="true"></i> Dashboard</a></li>
+				<li ng-class="{'active':analytic.tabShowReport === true}"><a ng-click="tabShow(false,true)" ><i class="fa fa-file-text fa-2" aria-hidden="true"></i> Reports</a></li>
+				<li class="form-group pull-right filter-btn" >
+					<button type="button" class="btn btn-xs cat-btn-update ng-scope pull-right margin-left6" ng-click="isOpenSidebar = !isOpenSidebar">
+						<i class="fa fa-filter fa-2 white" aria-hidden="true"></i>&nbsp;Filter
+					</button>
+				</li>
+			</ul>
+			<div ui-view></div>
+		</div>
+	</div>
 </div>
\ No newline at end of file
diff --git a/client/cat3/src/partials/sections/dashboard/design/designCtrl.js b/client/cat3/src/partials/sections/dashboard/design/designCtrl.js
index f945a8de4..0d04bee96 100644
--- a/client/cat3/src/partials/sections/dashboard/design/designCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/design/designCtrl.js
@@ -1,7 +1,84 @@
 (function (angular) {
 	"use strict";
-	angular.module('dashboard.design', [])
-	.controller('designCtrl',['$scope', function ($scope) {
-		$scope.Text = 'Design page';
+	angular.module('dashboard.design', []).config(['$stateProvider', '$urlRouterProvider', '$httpProvider', 'modulePermissionProvider', function($stateProvider, $urlRouterProvider, $httpProvider, modulePermissionProvider) {
+			var modulePerms = modulePermissionProvider.$get();
+			$stateProvider.state('dashboard.design.list', {
+				url: "/:provider/list",
+				templateUrl: "src/partials/sections/dashboard/design/view/designListView.html",
+				controller: "blueprintListCtrl as bpList",
+				params:{templateObj:null},
+				resolve: {
+					auth: ["$q", function ($q) {
+						var deferred = $q.defer();
+						// instead, go to a different page
+						if (modulePerms.analyticsBool()) {
+							// everything is fine, proceed
+							deferred.resolve();
+						} else {
+							deferred.reject({redirectTo: 'dashboard'});
+						}
+						return deferred.promise;
+					}]
+				}
+			}).state('dashboard.design.add', {
+				url: "/:provider/new",
+				templateUrl: "src/partials/sections/dashboard/design/view/blueprintCreate.html",
+				controller: "blueprintCreateCtrl as bpAdd",
+				params:{templateObj:null},
+				resolve: {
+					auth: ["$q", function ($q) {
+						var deferred = $q.defer();
+						// instead, go to a different page
+						if (modulePerms.analyticsBool()) {
+							// everything is fine, proceed
+							deferred.resolve();
+						} else {
+							deferred.reject({redirectTo: 'dashboard'});
+						}
+						return deferred.promise;
+					}]
+				}
+			})
+		}]).filter('inArray',['$filter', function($filter){
+			return function(list, arrayFilter, element){
+				if(arrayFilter){
+					return $filter("filter")(list, function(listItem){
+						return arrayFilter.indexOf(listItem[element]) === -1;
+					});
+				}
+			};
+		}])
+	.controller('designCtrl',['$scope','$state','genericServices', function ($scope,$state,genericServices) {
+		var design= this;
+		design.providersList= function () {
+			var params = {
+				url: 'src/partials/sections/dashboard/design/data/providers.json'
+			};
+			genericServices.promiseGet(params).then(function (data){
+				design.providersMenu=data;
+				design.tempType(data);
+				// $state.go('dashboard.designSubView',{subItem:data[0].name,view:'list'});
+			});
+
+		};
+		design.tempType=function (providers) {
+			var params = {
+				url: '/d4dMasters/readmasterjsonnew/16'
+			};
+			genericServices.promiseGet(params).then(function (template){
+				design.templateTypes=template;
+
+				//var treeNames=['DESIGN', $state.params.subItem,template[0].templateName,'list'];
+				//$rootScope.$emit('treeNameUpdate', treeNames);
+				//$state.go('dashboard.designSubView',{subItem:providers[0].name,view:'list',templateObj:template[0]});
+
+			});
+			// get organigetion
+			genericServices.getTreeNew().then(function (orgs) {
+				design.organObject=orgs;
+			});
+		};
+		design.providersList();
+		return design;
 	}]);
 })(angular);
\ No newline at end of file
diff --git a/client/cat3/src/partials/sections/dashboard/design/services/blueprintCreateServices.js b/client/cat3/src/partials/sections/dashboard/design/services/blueprintCreateServices.js
new file mode 100644
index 000000000..739ccca0f
--- /dev/null
+++ b/client/cat3/src/partials/sections/dashboard/design/services/blueprintCreateServices.js
@@ -0,0 +1,267 @@
+(function (angular) {
+    "use strict";
+    angular.module('design.bpCreate',[])
+        .service('blueprintCreateService',['$rootScope','$http','$q','toastr', 'designServices', function ($rootScope,$http,$q,toastr,designServices) {
+        	var blueprintServices = this;
+        	//for getting the list of templates.
+        	blueprintServices.getTemplates = function () {
+				var params = {
+					url: '/d4dMasters/readmasterjsonnew/17',
+					inlineLoader:true
+				};
+				return designServices.promiseGet(params);
+			};
+			//services listed for aws blueprints save and update.
+			blueprintServices.getImages = function () {
+				var params = {
+					url: '/vmimages',
+					inlineLoader:true
+				};
+				return designServices.promiseGet(params);
+			};
+			//list of operatig systems supported.
+			blueprintServices.getOperatingSytems = function () {
+				var params = {
+					url: '/aws/ec2/amiids',
+					inlineLoader:true
+				};
+				return designServices.promiseGet(params);	
+			};
+			//listing down the aws providers.
+			blueprintServices.getAWSProviders = function () {
+				var params = {
+					url: '/aws/providers',
+					inlineLoader:true
+				};
+				return designServices.promiseGet(params);
+			};
+			/*getting the aws provider with respect to ID that can be used to list down the vmimage.
+			(gives region, key pair as well)*/
+			blueprintServices.getAWSProviderWithId = function (providerId) {
+				var params = {
+					url: '/aws/providers/' + providerId,
+					inlineLoader:true
+				};
+				return designServices.promiseGet(params);
+			};
+			//listing down the images created on the basis on aws providers.
+			blueprintServices.getImageLists = function (providerId) {
+				var params = {
+					url: '/vmimages/providers/' + providerId,
+					inlineLoader:true
+				};
+				return designServices.promiseGet(params);
+			};
+			//listing down the images created on the basis on aws providers.
+			blueprintServices.getRegionLists = function () {
+				var params = {
+					url: '/vmimages/regions/list',
+					inlineLoader:true
+				};
+				return designServices.promiseGet(params);
+			};
+			//listing down the instance type based upon the image selected.
+			blueprintServices.getInstanceType = function () {
+				var params = {
+					url: '/vmimages/instancesizes/all/list',
+					inlineLoader:true
+				};
+				return designServices.promiseGet(params);
+			};
+			//listing down the vpcs for aws providers.
+			blueprintServices.postVpcs = function (providerId,region) {
+				var params = {
+					url: '/aws/providers/describe/vpcs',
+					inlineLoader:true,
+					data: {
+	                    "providerId": providerId,
+	                    "region": region
+                	}
+				};
+				return designServices.promisePost(params);
+			};
+			//listing down the subnets based upon the VPC ID.(set the instance count to 10 from Ctrl)
+			blueprintServices.postSubnets = function (vpcId,providerId,region) {
+				var params = {
+					url: '/aws/providers/vpc/'+ vpcId +'/subnets',
+					inlineLoader:true,
+					data: {
+	                    "providerId": providerId,
+	                    "region": region
+                	}
+				};
+				return designServices.promisePost(params);
+			};
+			//listing down the security groups based upon the VPC ID.
+			blueprintServices.postSecurityGroups = function (vpcId,providerId,region) {
+				var params = {
+					url: '/aws/providers/vpc/'+ vpcId +'/securitygroups',
+					inlineLoader:true,
+					data: {
+	                    "providerId": providerId,
+	                    "region": region
+                	}
+				};
+				return designServices.promisePost(params);
+			};
+			//listing down the subnets based upon the VPC ID.(set the instance count to 10 from Ctrl)
+			blueprintServices.getOrgBuProj = function () {
+				var params = {
+					url: '/organizations/getTreeNew'
+				};
+				return designServices.promiseGet(params);
+			};
+			//listing down the nexus server details associated to a project(on enabling checkbox, get GroupId)
+			blueprintServices.getNexusServerList = function () {
+				var params = {
+					url: '/d4dMasters/readmasterjsonnew/26',
+					inlineLoader:true
+				};
+				return designServices.promiseGet(params);
+			};
+			//listing down the docker details associate to a project(on enabling checkbox)
+			blueprintServices.getDockerList = function () {
+				var params = {
+					url: '/d4dMasters/readmasterjsonnew/18',
+					inlineLoader:true
+				};
+				return designServices.promiseGet(params);
+			};
+			//listing down the repos for nexus and docker based upon project and projectId(RepoName & group)
+			blueprintServices.getRepoList = function (projectId) {
+				var params = {
+					url: '/d4dMasters/project/' + projectId,
+					inlineLoader:true
+				};
+				return designServices.promiseGet(params);
+			};
+			//listing down the repo url related to the repository selected based upon nexusId
+			blueprintServices.getRepoUrl = function (nexusId) {
+				var params = {
+					url: '/nexus/'+ nexusId +'/repositories',
+					inlineLoader:true
+				};
+				return designServices.promiseGet(params);
+			};
+			//listing down the artifacts based upon nexusId,repo selected & the group.
+			blueprintServices.getArtifacts = function (nexusId, repoName, groupId) {
+				var params = {
+					url: '/nexus/' + nexusId + '/repositories/' + repoName + '/group/' + groupId + '/artifact',
+					inlineLoader:true
+				};
+				return designServices.promiseGet(params);
+			};
+			//listing down the versions based upon the nexuId, repo selected, group and artifact selected.
+			blueprintServices.getVersions = function (nexusId, repoName, groupId, artifactId) {
+				var params = {
+					url: '/nexus/' + nexusId + '/repositories/' + repoName + '/group/' + groupId + '/artifact/' + artifactId + '/versions',
+					inlineLoader:true
+				};
+				return designServices.promiseGet(params);
+			};
+			//list down the chefServer. 
+			blueprintServices.getChefServer = function () {
+				var params = {
+					url: '/d4dMasters/readmasterjsonnew/10',
+					inlineLoader:true
+				};
+				return designServices.promiseGet(params);
+			};
+			//get the cft file details.
+			blueprintServices.getCFTParams = function (cftTemplateFileName) {
+				var params = {
+					url: '/d4dMasters/cftTemplate?templateFile=' + cftTemplateFileName,
+					inlineLoader:true
+				};
+				return designServices.promiseGet(params);
+			};
+			//save api for creating a blueprint
+			blueprintServices.postBlueprintSave = function (orgId,bgId,projectId,blueprintData) {
+				var params = {
+					url: '/organizations/' + orgId + '/businessgroups/' + bgId + '/projects/' + projectId + '/blueprints',
+					data: blueprintData
+				};
+				return designServices.promisePost(params);
+			};
+
+			//services listed for azure blueprints save and update.
+
+			//listing down the azure providers
+			blueprintServices.getAzureProviders = function() {
+				var params = {
+					url: '/azure/providers',
+					inlineLoader:true
+				};
+				return designServices.promiseGet(params);
+			};
+			//listing down azure locations
+			blueprintServices.getAzureLocations = function (azureProviderId) {
+				var params = {
+					//displayName
+					url: '/azure/' + azureProviderId + '/locations',
+					inlineLoader:true
+				};
+				return designServices.promiseGet(params);
+			};
+			//listing down the azure networks(VPC)
+			blueprintServices.getAzureVPC = function (azureProviderId) {
+				var params = {
+					url: '/azure/'+ azureProviderId +'/networks',
+					inlineLoader:true
+				};
+				return designServices.promiseGet(params);
+			};
+
+			//services listed for openstack blueprints save and update.
+			//listing down openstack providers
+			blueprintServices.getOpenStackProviders = function() {
+				var params = {
+					url: '/openstack/providers',
+					inlineLoader:true
+				};
+				return designServices.promiseGet(params);
+			};
+			//listing down the openstack flavors related to provider
+			blueprintServices.getProviderFlavors = function(providerId) {
+				var params = {
+					url: '/openstack/' + providerId + '/flavors',
+					inlineLoader:true
+				};
+				return designServices.promiseGet(params);
+			};
+			//listing down the openstack networks related to provider
+			blueprintServices.getProviderNetwork = function(providerId) {
+				var params = {
+					url: '/openstack/' + providerId + '/networks',
+					inlineLoader:true
+				};
+				return designServices.promiseGet(params);
+			};
+			//listing down the security groups related to provider
+			blueprintServices.getProviderSecurityGroup = function(providerId) {
+				var params = {
+					url: '/openstack/' + providerId + '/securityGroups',
+					inlineLoader:true
+				};
+				return designServices.promiseGet(params);
+			};
+
+			//services listed for vmware blueprints save and update.
+			//listing down vmware providers.
+			blueprintServices.getVmWareProviders = function() {
+				var params = {
+					url: '/vmware/providers',
+					inlineLoader:true
+				};
+				return designServices.promiseGet(params);
+			};
+			//listing down dataStore related to Provider.
+			blueprintServices.getProviderDataStore = function(providerId) {
+				var params = {
+					url: '/vmware/' + providerId + '/datastores',
+					inlineLoader:true
+				};
+				return designServices.promiseGet(params);
+			};
+        }]);
+})(angular);
\ No newline at end of file
diff --git a/client/cat3/src/partials/sections/dashboard/design/services/blueprintListServices.js b/client/cat3/src/partials/sections/dashboard/design/services/blueprintListServices.js
new file mode 100644
index 000000000..3e484a3f4
--- /dev/null
+++ b/client/cat3/src/partials/sections/dashboard/design/services/blueprintListServices.js
@@ -0,0 +1,108 @@
+(function (angular) {
+    "use strict";
+    angular.module('design.BpList',[])
+        .service('blueprintService',['$rootScope','$http','$q','toastr','$state','$modal','confirmbox','designServices',function ($rootScope,$http,$q,toastr,$state,$modal,confirmbox,designServices) {
+            var bpServ={};
+             bpServ.createList = function(bpType){
+                var organObjectId=[];
+                ///organObjectId.envOptions=$rootScope.organObject[$rootScope.organNewEnt.org].environments;
+                if($rootScope.organObject){
+                    var tempType=(bpType) ? bpType :$state.params.templateObj.templatetype;
+                    var pagination =(bpType) ? false :true;
+                    organObjectId.org =$rootScope.organObject[$rootScope.organNewEnt.org].rowid;
+                    organObjectId.buss=$rootScope.organObject[$rootScope.organNewEnt.org].businessGroups[$rootScope.organNewEnt.buss].rowid;
+                    organObjectId.proj=$rootScope.organObject[$rootScope.organNewEnt.org].businessGroups[$rootScope.organNewEnt.buss].projects[$rootScope.organNewEnt.proj].rowid;
+                    var params = {
+                        url: '/organizations/'+organObjectId.org+'/businessgroups/'+organObjectId.buss+'/projects/'+organObjectId.proj+'/blueprintList?pagination='+pagination+'&templateType='+tempType+'&providerType='+angular.lowercase($state.params.subItem)
+                    };
+                    return designServices.promiseGet(params);
+                }
+            };
+            bpServ.launchBp = function (id) {
+                $modal.open({
+                    animate: true,
+                    templateUrl: "src/partials/sections/dashboard/design/view/popups/blueprintLaunch.html",
+                    controller: "bpLaunchInstanceCtrl as lanIns",
+                    backdrop: 'static',
+                    keyboard: false,
+                    resolve: {
+                        bpItem: function() {
+                            return {
+                                id:id,
+                                organObject:$rootScope.organObject
+                            };
+                        }
+                    }
+                }).result.then(function(env) {
+                    var params = {
+                        url: '/blueprint-frames/',
+                        data:{
+                            "blueprintId": id,
+                            "environmentId": env
+                        }
+                    };
+                    designServices.promisePost(params).then(function () {
+                        toastr.success('Successfully launched.');
+                    });
+                });
+            };
+            bpServ.copyBp = function (ids) {
+                $modal.open({
+                    animate: true,
+                    templateUrl: "src/partials/sections/dashboard/design/view/popups/blueprintCopy.html",
+                   controller: "bpCopyCtrl as bpCopy",
+                    backdrop: 'static',
+                    keyboard: false,
+                    resolve: {
+                        bpItem: function() {
+                            return {
+                                ids:ids,
+                                organObject:$rootScope.organObject
+                            };
+                        }
+                    }
+                }).result.then(function(orgDetails) {
+                    var params = {
+                        url: '/blueprints/copy/',
+                        data:{
+                            "orgid": $rootScope.organObject[orgDetails.copyOrg].rowid,
+                            "buid": $rootScope.organObject[orgDetails.copyOrg].businessGroups[orgDetails.copyBuss].rowid,
+                            "projid": $rootScope.organObject[orgDetails.copyOrg].businessGroups[orgDetails.copyBuss].projects[orgDetails.copyProj].rowid,
+                            "blueprints":ids
+                        }
+                    };
+                    designServices.promisePost(params).then(function () {
+                        toastr.success('Successfully copied.');
+                    });
+                });
+            };
+            bpServ.deleteBp = function (ids) {
+                var modalOptions = {
+                    closeButtonText: 'Cancel',
+                    actionButtonText: 'Delete',
+                    actionButtonStyle: 'cat-btn-delete',
+                    headerText: 'Delete  Blueprint',
+                    bodyText: 'Are you sure you would like to remove the selected blueprints ?'
+                };
+                confirmbox.showModal({}, modalOptions).then(function() {
+                    var bPIds=[];
+                    if(angular.isArray(ids)){
+                        bPIds=ids;
+                    } else {
+                        bPIds.push(ids);
+                    }
+                    var params = {
+                        url: '/blueprints',
+                        data:{blueprints:bPIds}
+                    };
+                    return designServices.promiseDelete(params).then(function(){
+                        toastr.success('Successfully deleted');
+                        angular.each(ids,function (val) {
+                            angular.element('#'+val).hide();
+                        });
+                    });
+                });
+            };
+            return bpServ;
+        }]);
+})(angular);
\ No newline at end of file
diff --git a/client/cat3/src/partials/sections/dashboard/design/view/blueprintCreate.html b/client/cat3/src/partials/sections/dashboard/design/view/blueprintCreate.html
new file mode 100644
index 000000000..d6eea0036
--- /dev/null
+++ b/client/cat3/src/partials/sections/dashboard/design/view/blueprintCreate.html
@@ -0,0 +1,490 @@
+<div ng-controller="blueprintCreateCtrl as bpCreate">
+   <div id="create-bp" class="col-lg-12">
+      <div id="content">
+         <div next-text="Next" previous-text="Previous">
+            <div ng-if="bpTypeName === 'Composite'">
+               <form name="compositeBlueprintCreation" novalidate>
+                  <span ng-include="'src/partials/sections/dashboard/design/view/createComposite.html'"></span>
+               </form>
+            </div>
+            <form name="newBlueprintForm" novalidate>
+               <div ng-show="steps[0].isDisplayed">
+                  <div class="col-sm-3 col-lg-3 col-md-3 blueprintTemplate" ng-repeat="templateDetail in templateList" ng-if="bpTypeName == templateDetail.templatetypename" ng-class="{'blueprintTemplateSelected':templateDetail.selected}" ng-click="blueprintTemplateClick(templateDetail);">
+                     <ul class="list-unstyled system-prop" style="text-align:center;">
+                        <li>
+                           <img style="height:40px;width:auto;" alt="templateLogo" ng-src="{{logo}}">
+                        </li>
+                        <li style="font-size:12px;"><u><b>{{templateDetail.templatename}}</b></u></li>
+                        <li style="font-size:10px;" ng-repeat="item in templateDetail.templatescookbooks.split(',')">{{item}}</li>
+                     </ul>
+                  </div>
+                  <div class="col-sm-3 col-lg-3 col-md-3 blueprintTemplate" ng-repeat="templateDetail in imageList" ng-if="bpTypeName === 'OSImage'" ng-class="{'blueprintTemplateSelected':templateDetail.selected}" ng-click="blueprintTemplateClick(templateDetail);">
+                     <ul class="list-unstyled system-prop" style="text-align:center;">
+                        <li>
+                           <img style="height:40px;width:auto;" alt="templateLogo" ng-src="{{osImageLogo}}">
+                        </li>
+                        <li style="font-size:12px;"><u><b>{{templateDetail.name}}</b></u></li>
+                     </ul>
+                  </div>
+               </div>
+               <div ng-show="steps[1].isDisplayed">
+                  <div class="col-sm-2 col-lg-2 col-md-2 blueprintTemplate blueprintTemplateSelected" ng-show="templateSelected.templatetypename !== 'Docker'">
+                     <ul class="list-unstyled system-prop" style="text-align:center;">
+                        <li ng-if="templateSelected.templatetypename === 'SoftwareStack' || templateSelected.templatetypename === 'CloudFormation'">
+                           <img style="height:40px;width:auto;" alt="templateLogo" ng-src="{{logo}}">
+                        </li>
+                        <li ng-if="templateSelected.osType">
+                           <img style="height:40px;width:auto;" alt="OSImage" ng-src="{{osImageLogo}}">
+                        </li>
+                        <li ng-if="templateSelected.templatetypename === 'SoftwareStack' || templateSelected.templatetypename === 'CloudFormation'" style="font-size:12px;"><u><b>{{templateSelected.templatename}}</b></u></li>
+                        <li ng-if="templateSelected.osType" style="font-size:12px;"><u><b>{{templateSelected.name}}</b></u></li>
+                        <li ng-if="templateSelected.templatetypename === 'SoftwareStack'" style="font-size:10px;" ng-repeat="item in templateSelected.templatescookbooks.split(',')">{{item}}</li>
+                     </ul>
+                  </div>
+                  <div class="col-sm-10 col-lg-10 col-md-10">
+                     <accordion>
+                        <accordion-group ng-if="templateSelected.templatetypename !== 'Docker' && templateSelected.templatetypename !=='CloudFormation'" ng-init="accGroupStatus = {opened: isFirstOpen}" is-open="accGroupStatus.opened">
+                           <accordion-heading>
+                              <i class="fa fa-fw" ng-class="{'fa-minus-circle red':accGroupStatus.opened,'fa-plus-circle':!accGroupStatus.opened }"></i>
+                              Configure Provider Parameters
+                           </accordion-heading>
+                           <div class="col-lg-6 col-md-6">
+                              <label for="instanceOS">Choose Operating System:<span class="red">&nbsp;*</span>
+                                 <span ng-show="newBlueprintForm.osListing.$touched && newBlueprintForm.osListing.$invalid" class="inputValidationMsg">Required</span>
+                                 <loading size="small" name="isOSLoading" type="inline"></loading>
+                              </label>
+                              <select name="osListing" ng-model="bpCreate.newEnt.osListing" class="chooseOS width-100 form-control" ng-disabled="isOSImage" ng-change="bpCreate.changeImageOS();" required>
+                                 <option ng-if="templateSelected.templatetypename === 'SoftwareStack'" value="">Select OS</option>
+                                 <option ng-if="templateSelected.templatetypename === 'SoftwareStack'" ng-repeat="name in bpCreate.osListing" value="{{name.osType}}">{{name.os_name}}</option>
+                                 <option ng-if="templateSelected.osType" value="{{templateSelected.osType}}">{{templateSelected.osName}}</option>
+                              </select>
+                           </div>
+                           <div class="col-lg-6 col-md-6">
+                              <label for="providerId">Choose Provider:<span class="red">&nbsp;*</span>
+                                 <span ng-show="newBlueprintForm.providerId.$touched && newBlueprintForm.providerId.$invalid" class="inputValidationMsg">Required</span>
+                                 <loading size="small" name="isOSLoading" type="inline"></loading>
+                              </label>
+                              <select name="providerId" ng-model="bpCreate.newEnt.providers" class="chooseOSProvider width-100 form-control" ng-change="bpCreate.getProviderImage();" ng-disabled="isOSImage" required>
+                                 <option ng-if="templateSelected.templatetypename === 'SoftwareStack'" value="">Select Provider</option>
+                                 <option ng-if="templateSelected.templatetypename === 'SoftwareStack'" ng-repeat="providerDetail in bpCreate.providerListing" value="{{providerDetail._id}}">{{providerDetail.providerName}}</option>
+                                 <option ng-if="templateSelected.osType" ng-repeat="providerDetail in bpCreate.providerListing" value="{{providerDetail._id}}">{{providerDetail.providerName}}</option>
+                              </select>
+                           </div>
+                           <div class="col-lg-6 col-md-6 margintop15">
+                              <label for="imageId">Choose Available Images:<span class="red">&nbsp;*</span>
+                                 <span ng-show="newBlueprintForm.imageId.$touched && newBlueprintForm.imageId.$invalid" class="inputValidationMsg">Required</span>
+                                 <loading size="small" name="isImageLoading" type="inline"></loading>
+                              </label>
+                              <select  ng-model="bpCreate.newEnt.images" name="imageId" class="chooseSecurity width-100 form-control" ng-change="bpCreate.getInstanceType();" ng-disabled="isOSImage" required>
+                                 <option ng-if="templateSelected.templatetypename === 'SoftwareStack'" value="">Select Image</option>
+                                 <option ng-if="templateSelected.templatetypename === 'SoftwareStack'" ng-repeat="imageDetail in bpCreate.imageListing" value="{{imageDetail._id}}">{{imageDetail.name}}</option>
+                                  <option ng-if="templateSelected.osType" ng-repeat="imageDetail in bpCreate.imageListing" value="{{imageDetail._id}}">{{imageDetail.name}}</option>
+                              </select>
+                           </div>
+                           <div class="col-lg-6 col-md-6 margintop15" ng-if="providerType ==='AZURE'">
+                              <label for="blueprintSecurityGroupPortInput">Security Group Ports:<span class="red"  >&nbsp;*</span>
+                                 <span ng-show="newBlueprintForm.blueprintSecurityGroupPortInput.$touched && newBlueprintForm.blueprintSecurityGroupPortInput.$invalid" class="inputValidationMsg">Required</span>
+                              </label>
+                              <input ng-model="bpCreate.newEnt.blueprintSecurityGroupPort" name="blueprintSecurityGroupPortInput" class="form-control" type="text" autofocus="autofocus" required placeholder="Enter ports separated by comma">
+                           </div>
+                           <div class="col-lg-6 col-md-6 margintop15" ng-if="providerType === 'AWS'  || providerType === 'AZURE'">
+                              <label for="region">Choose Region:<span class="red">&nbsp;*</span>
+                                 <span ng-show="newBlueprintForm.region.$touched && newBlueprintForm.region.$invalid" class="inputValidationMsg">Required</span>
+                                 <loading size="small" name="isRegionKeyPairLoading" type="inline"></loading>
+                              </label>
+                              <select ng-model="bpCreate.newEnt.region" name="region" class="chooseSecurity width-100 form-control" ng-change="bpCreate.listVpcs();" required>
+                                 <option value="">Select Region</option>
+                                 <option ng-if="providerType === 'AWS'" value="{{bpCreate.regionListing}}">{{bpCreate.regionListing}}</option>
+                                 <option ng-repeat="location in bpCreate.regionListingAzure" ng-if="providerType === 'AZURE'" value="{{location.Name}}">{{location.Name}}</option>
+                              </select>
+                           </div>
+                           <div class="col-lg-6 col-md-6 margintop15" ng-if="providerType === 'OPENSTACK'">
+                              <label for="flavour">Choose Flavour:<span class="red">&nbsp;*</span>
+                                 <span ng-show="newBlueprintForm.flavour.$touched && newBlueprintForm.flavour.$invalid" class="inputValidationMsg">Required</span>
+                                 <loading size="small" name="isRegionKeyPairLoading" type="inline"></loading>
+                              </label>
+                              <select ng-model="bpCreate.newEnt.flavour" name="flavour" class="width-100 form-control" required>
+                                 <option value="">Select Flavour</option>
+                                 <!-- <option ng-repeat="flavours in bpCreate.flavourListing" value="{{location.Name}}">{{location.Name}}</option> -->
+                              </select>
+                           </div>
+                           <div class="col-lg-6 col-md-6 margintop15" ng-if="providerType === 'OPENSTACK'">
+                              <label for="network">Choose Network:<span class="red">&nbsp;*</span>
+                                 <span ng-show="newBlueprintForm.network.$touched && newBlueprintForm.network.$invalid" class="inputValidationMsg">Required</span>
+                                 <loading size="small" name="isRegionKeyPairLoading" type="inline"></loading>
+                              </label>
+                              <select ng-model="bpCreate.newEnt.network" name="network" class="width-100 form-control" required>
+                                 <option value="">Select Network</option>
+                                 <!-- <option ng-repeat="flavours in bpCreate.flavourListing" value="{{location.Name}}">{{location.Name}}</option> -->
+                              </select>
+                           </div>
+                           <div class="col-lg-6 col-md-6 margintop15" ng-if="providerType === 'AWS'  || providerType === 'AZURE'">
+                              <label for="vpcId">Choose VPC:<span class="red">&nbsp;*</span>
+                                 <span ng-show="newBlueprintForm.vpcId.$touched && newBlueprintForm.vpcId.$invalid" class="inputValidationMsg">Required</span>
+                                 <loading size="small" name="isVPCLoading" type="inline"></loading>
+                              </label>
+                              <select ng-model="bpCreate.newEnt.vpcId" name="vpcId" class="chooseSelect chooseImage width-100 form-control" ng-change="bpCreate.postSubnets();" required>
+                                 <option value="">Select VPC</option>
+                                 <option ng-if="providerType === 'AWS'" ng-repeat="vpcDetails in bpCreate.vpcListing" value="{{vpcDetails.VpcId}}">{{vpcDetails.VpcId}} ({{vpcDetails.CidrBlock}}) {{vpcDetails.Tags[0].Value}}</option>
+                                 <option ng-if="providerType === 'AZURE'" ng-repeat="vpcDetailsAzure in bpCreate.vpcListing" value="{{vpcDetailsAzure.Id}}">{{vpcDetailsAzure.Name}}</option>
+                              </select>
+                           </div>
+                           <div class="col-lg-6 col-md-6 margintop15" ng-if="providerType !=='VMWARE'">
+                              <label for="subnetId">Choose Subnet:<span class="red">&nbsp;*</span>
+                                 <span ng-show="newBlueprintForm.subnetId.$touched && newBlueprintForm.subnetId.$invalid" class="inputValidationMsg">Required</span>
+                                 <loading size="small" name="isSubnetLoading" type="inline"></loading>
+                              </label>
+                              <select ng-model="bpCreate.newEnt.subnetId" name="subnetId" class="chooseSelect chooseImage width-100 form-control" ng-change="bpCreate.postSecurityGroups();" required>
+                                 <option value="">Select Subnet</option>
+                                 <option ng-if="providerType === 'AWS'" ng-repeat="subnetDetails in bpCreate.subnetListing" value="{{subnetDetails.SubnetId}}">{{subnetDetails.SubnetId}} ({{subnetDetails.AvailabilityZone}}) | {{subnetDetails.Tags[0].Value}}</option>
+                                 <option ng-if="providerType === 'AZURE'" ng-repeat="subnetDetailsAzure in bpCreate.subnetListingAzure" value="{{subnetDetailsAzure.Name}}">{{subnetDetailsAzure.Name}}</option>
+                              </select>
+                           </div>
+                           <div class="col-lg-6 col-md-6 margintop15" ng-if="providerType === 'AWS'">
+                              <label for="keypairId">Choose KeyPair:<span class="red">&nbsp;*</span>
+                                 <span ng-show="newBlueprintForm.keypairId.$touched && newBlueprintForm.keypairId.$invalid" class="inputValidationMsg">Required</span>
+                                 <loading size="small" name="isRegionKeyPairLoading" type="inline"></loading>
+                              </label>
+                              <select ng-model="bpCreate.newEnt.keyPair" name="keypairId" class="instanceType chooseInstance width-100 form-control" required>
+                                 <option value="">Select KeyPair </option>
+                                 <option value="{{bpCreate.keyPairListing}}">{{bpCreate.keyPairListing}}</option>
+                              </select>
+                           </div>
+                           <div class="col-lg-6 col-md-6 margintop15" ng-if="providerType === 'AWS'  || providerType === 'AZURE'">
+                              <label for="instancesize">Instance Type:<span class="red">&nbsp;*</span>
+                                 <span ng-show="newBlueprintForm.instancesize.$touched && newBlueprintForm.instancesize.$invalid" class="inputValidationMsg">Required</span>
+                                 <loading size="small" name="isInstanceTypeLoading" type="inline"></loading>
+                              </label>
+                              <select ng-model="bpCreate.newEnt.instanceType" name="instancesize" class="width-100 chooseSelect form-control" required>
+                                 <option value="">Select Instanace Type</option>
+                                 <option ng-if="providerType === 'AWS'" ng-repeat="instanceType in bpCreate.instanceType[0].hvm" value="{{instanceType}}">{{instanceType}}</option>
+                                 <option ng-if="providerType === 'AZURE'" ng-repeat="instanceType in bpCreate.instanceType" value="{{instanceType}}">{{instanceType}}</option>
+                              </select>
+                           </div>
+                           <div class="col-lg-6 col-md-6 margintop15" ng-if="providerType ==='AWS'   || providerType ==='OPENSTACK'">
+                              <label for="checkbox-toggle">Security Group:<span class="red">&nbsp;*</span>
+                                 <loading size="small" name="isSecurityGroupLoading" type="inline"></loading>
+                              </label>
+                              <div class="col-lg-6 securityGroupComponent" ng-if="providerType === 'AWS'">
+                                 <ul>
+                                    <li ng-repeat="securityGroupDetails in bpCreate.securityGroupListing" id="securityGroupIds" name="securityGroupIds"  class="input-group col-md-12 widthBox"><label class="checkbox check-list"><input class="checkbox-list" type="checkbox" ng-checked="securityGroupDetails._isChecked" ng-model="securityGroupDetails._isChecked" name="bpCreate.newEnt.securityGroupCheck"/>{{securityGroupDetails.GroupId}} | {{securityGroupDetails.GroupName}} </label></li>
+                                 </ul>
+                              </div>
+                              <select  ng-model="bpCreate.newEnt.securityGroup" name="securityGroup" class="width-100 chooseSelect form-control" required ng-if="providerType ==='OPENSTACK'">
+                                 <option value="">Select Security Group</option>
+                                 <!-- <option ng-repeat="instanceCount in bpCreate.instanceCount(10)" value="{{instanceCount}}">{{instanceCount}}</option> -->
+                              </select>
+                           </div>
+                           <div class="col-lg-6 col-md-6 margintop15" ng-if="providerType === 'AWS'  || providerType === 'AZURE'">
+                              <label for="instanceCount">Instances to Launch:<span class="red">&nbsp;*</span>
+                                 <span ng-show="newBlueprintForm.instanceCount.$touched && newBlueprintForm.instanceCount.$invalid" class="inputValidationMsg">Required</span>
+                                 <loading size="small" name="isImageLoading" type="inline"></loading>
+                              </label>
+                              <select  ng-model="bpCreate.newEnt.instanceCount" name="instanceCount" class="width-100 chooseSelect form-control" required>
+                                 <option value="">Select No. Of Instances</option>
+                                 <option ng-repeat="instanceCount in bpCreate.instanceCount(10)" value="{{instanceCount}}">{{instanceCount}}</option>
+                              </select>
+                           </div>
+                           <div class="col-lg-6 col-md-6 margintop15" ng-if="providerType === 'VMWARE'">
+                              <label for="dataStore">Choose Data Store:<span class="red">&nbsp;*</span>
+                                 <span ng-show="newBlueprintForm.dataStore.$touched && newBlueprintForm.dataStore.$invalid" class="inputValidationMsg">Required</span>
+                                 <loading size="small" name="isRegionKeyPairLoading" type="inline"></loading>
+                              </label>
+                              <select ng-model="bpCreate.newEnt.dataStore" name="dataStore" class="width-100 form-control" required>
+                                 <option value="">Select Data Store </option>
+                                 <option ng-repeat="storeName in bpCreate.dataStore" value="{{storeName.name}}">{{storeName.name}}</option>
+                              </select>
+                           </div>
+                           <!--To add the Swipe Functionality-->                            
+                        </accordion-group>
+                        <!--adding organisation parameters starts here-->
+                        <accordion-group ng-init="accGroupStatus = {opened: isOrgOpen}" is-open="accGroupStatus.opened">
+                           <accordion-heading>
+                              <i class="fa fa-fw" ng-class="{'fa-minus-circle red':accGroupStatus.opened,'fa-plus-circle':!accGroupStatus.opened }"></i>
+                              Configure Organization Parameters
+                           </accordion-heading>
+                           <div class="col-lg-6 col-md-6">
+                              <label for="orgnameSelect">Choose Organization <span class="red">&nbsp;*</span>
+                                 <span ng-show="newBlueprintForm.orgnameSelect.$touched && newBlueprintForm.orgnameSelect.$invalid" class="inputValidationMsg">Required</span>
+                              </label>
+                              <select ng-model="bpCreate.newEnt.orgList" name="orgnameSelect" class="chooseOrgselect2 width-100 form-control" ng-change="bpCreate.getBG();" required>
+                                 <option value="">Select Organization</option>
+                                 <option ng-repeat="config in bpCreate.orgBUProjListing" value="{{config.orgid}}">{{config.name}}</option>
+                              </select>
+                           </div>
+                           <div class="col-lg-6 col-md-6">
+                              <label for="blueprintNameInput">Enter Blueprint Name:<span class="red"  >&nbsp;*</span>
+                                 <span ng-show="newBlueprintForm.blueprintNameInput.$touched && newBlueprintForm.blueprintNameInput.$invalid" class="inputValidationMsg">Required</span>
+                              </label>
+                              <input ng-model="bpCreate.newEnt.blueprintName" name="blueprintNameInput" class="form-control" type="text" autofocus="autofocus" required>
+                           </div>
+                           <div class="col-lg-6 col-md-6 margintop15">
+                              <label for="bgListInput">Choose Business Group <span class="red">&nbsp;*</span>
+                                 <span ng-show="newBlueprintForm.bgListInput.$touched && newBlueprintForm.bgListInput.$invalid" class="inputValidationMsg">Required</span>
+                              </label>
+                              <select ng-model="bpCreate.newEnt.bgList" name="bgListInput" class="chooseBG width-100 form-control" ng-change="bpCreate.getProject();" required>
+                                 <option value="">Select Business Group</option>
+                                 <option ng-repeat="config in bpCreate.bgListing" value="{{config.businessGroups[0].rowid}}">{{config.businessGroups[0].name}}</option>
+                              </select>
+                           </div>
+                           <div class="col-lg-6 col-md-6 margintop15">
+                              <label for="projectListInput">Choose Project <span class="red">&nbsp;*</span>
+                                 <span ng-show="newBlueprintForm.projectList.$touched && newBlueprintForm.projectList.$invalid" class="inputValidationMsg">Required</span>
+                              </label>
+                              <select ng-model="bpCreate.newEnt.projectList" name="projectListInput" class="chooseProject width-100 form-control" ng-change="bpCreate.enableAppDeploy();" required>
+                                 <option value="">Select Project</option>
+                                 <option ng-repeat="config in bpCreate.projListing" value="{{config.businessGroups[0].projects[0].rowid}}">{{config.businessGroups[0].projects[0].name}}</option>
+                              </select>
+                           </div>
+                           
+                           <!-- Docker Image selection table -->
+                           <div ng-if="templateSelected.templatetypename === 'Docker'" class="col-lg-12 col-md-12" style="margin-top:9px;">
+                              <label for="category" style="margin-top:5px;">Docker Images<span class="red">&nbsp;*</span>
+                              </label>
+                              <a class="btn btn-primary adddockertemplate pull-right" onclick="showdockertemplateadder();" style="margin-bottom:5px;">Add</a>
+                              <table class="table-bordered text-center">
+                                 <thead>
+                                    <tr class="rowCustomStyle" role="row">
+                                       <td>Name</td>
+                                       <td>Image Path</td>
+                                       <td>Tag</td>
+                                       <td>Launch Params</td>
+                                       <td>Re-Order</td>
+                                    </tr>
+                                 </thead>
+                                 <!-- <tbody>
+                                    <tr ng-repeat="docker in dockerDetails">
+                                       <td>{{docker.dockercontainerpathstitle}}</td>
+                                       <td>{{docker.dockercontainerpaths}}</td>
+                                       <td>{{docker.dockerrepotags}}</td>
+                                       <td><input type="text" ng-model="docker.dockerlaunchparameters"><i class="btn icon-append fa fa-list-alt fa-lg" title="Launch Parameters" ng-click="launchParam(docker, $index)"></i></td>
+                                       <td><i class="fa fa-chevron-circle-up fa-lg" ng-click="moveUpChoice(dockerDetails,this.$index)"></i><i class="fa fa-chevron-circle-down fa-lg marginleft5" ng-click="moveDownChoice(dockerDetails,this.$index)"></i></td>
+                                    </tr>
+                                 </tbody> -->
+                              </table>
+                           </div>
+                           <!-- End Docker Image selection table -->
+                        </accordion-group>
+                        <!--configure runlist collapse starts here-->
+                        <accordion-group ng-if="templateSelected.templatetypename !=='Docker' && templateSelected.templatetypename !=='CloudFormation'" ng-init="accGroupStatus = {opened: false}" is-open="accGroupStatus.opened">
+                           <accordion-heading>
+                              <i class="fa fa-fw" ng-class="{'fa-minus-circle red':accGroupStatus.opened,'fa-plus-circle':!accGroupStatus.opened }"></i>
+                              Configure Runlist Parameters
+                           </accordion-heading>
+                           <div class="col-lg-6 col-md-6 col-sm-6 col-xs-12">
+                              <!-- <label>
+                                 <i class="fa fa-list-ul addRunList-icon"></i>
+                                 <lable class="control-label" ng-if="!isEditMode">Add Runlist</lable>
+                                 <lable class="control-label" ng-if="isEditMode && chefrunlist.length==0">Add Runlist</lable>
+                                 <lable class="control-label" ng-if="isEditMode && chefrunlist.length>0">Edit Runlist</lable>
+                              </label> -->
+                              <span class="cursor pull-right">
+                                 <i class="fa fa-plus-circle cursor" title="Edit Runlist" ng-click="updateCookbook()"></i>
+                              </span>
+                              <div class="view-runlist">
+                                 <table class="table table-bordered text-center">
+                                    <thead>
+                                       <tr>
+                                          <th class="text-center">View Runlist</th>
+                                       </tr>
+                                    </thead>
+                                    <tbody>
+                                       <tr ng-repeat="item in templateSelected.templatescookbooks.split(',')">
+                                          <td>{{item}}</td>
+                                       </tr>
+                                    </tbody>
+                                 </table>
+                              </div>
+                           </div>
+                        </accordion-group>
+                        <!--execute modal starts here-->
+                        <!--configure runlist collapse ends here-->                  
+                        <!--adding new collapse-->
+                        <accordion-group ng-if="templateSelected.templatetypename !=='Docker' && templateSelected.templatetypename !=='CloudFormation'" ng-init="accGroupStatus = {opened: false}" is-open="accGroupStatus.opened">
+                           <accordion-heading>
+                              <i class="fa fa-fw" ng-class="{'fa-minus-circle red':accGroupStatus.opened,'fa-plus-circle':!accGroupStatus.opened }"></i>
+                              Configure Application
+                           </accordion-heading>
+                           <label style="margin: 5px;font-size:13px;" class="checkbox">
+                           <input type="checkbox" class="checkConfigApp">
+                           <i></i>Deploy app during Bootstrap
+                           </label>
+                           <div class="col-lg-6 col-md-6 margintop15" ng-show="showRepoServerName">
+                              <label for="">Repository Server:<span class="redSpan">*</span>
+                              </label>
+                              <select ng-model="bpCreate.newEnt.nexusDockerServer" name="" class=" width-100 form-control" ng-change="bpCreate.selectServer();">
+                                 <option value="">Choose Server</option>
+                                 <option value="">{{}}</option>
+                              </select>
+                           </div>
+                           <div class="col-lg-6 col-md-6 margintop15" ng-show="showRepoServerName">
+                              <label for="">Repository Name:<span class="redSpan">*</span>
+                              </label>
+                              <select id="chooseRepository" name="" class=" width-100 form-control">
+                                 <option value="">Choose Repositories</option>
+                              </select>
+                           </div>
+                           <div class="col-lg-6 col-md-6 margintop15 groupClass" ng-show="showRepoDetails">
+                              <label for="">Group ID:<span class="redSpan">*</span>
+                              </label>
+                              <select id="chooseGroupId" name="" class=" width-100 form-control">
+                                 <option value="">Choose Group ID</option>
+                              </select>
+                           </div>
+                           <div class="col-lg-6 col-md-6 margintop15 artifactClass" ng-show="showRepoDetails">
+                              <label for="">Artifacts:<span class="redSpan">*</span>
+                              </label>
+                              <select id="chooseArtifacts" name="" class=" width-100 form-control">
+                                 <option value="">Choose Artifacts</option>
+                              </select>
+                           </div>
+                           <div class="col-lg-6 col-md-6 margintop15 versionClass" ng-show="showRepoDetails">
+                              <label for="">Versions:<span class="redSpan">*</span>
+                              </label>
+                              <select id="chooseVersions" name="" class=" width-100 form-control">
+                                 <option value="">Choose Versions</option>
+                              </select>
+                           </div>
+                           <div class="col-lg-12 col-md-12 margintop15 repoUrlClass" ng-show="showRepoDetails">
+                              <label>Repository URL:<span class="redSpan">*</span>
+                              </label>
+                              <input id="repositoryUrl" type="text" class="form-control" name="" disabled>
+                           </div>
+                           <div class="col-lg-6 col-md-6 margintop15 imageTagClass" ng-show="">
+                              <label for="">Tags:<span class="redSpan">*</span>
+                              </label>
+                              <select id="imageTag" name="" class="width-100 form-control">
+                                 <option value="">Choose Tag</option>
+                              </select>
+                           </div>
+                           <div class="col-lg-6 col-md-6 margintop15 containerClass containerIdClass containerUpgradeDeploy" ng-show="">
+                              <label>Container Name/ID:
+                              </label>
+                              <input id="containerIdDiv" type="text" class="form-control" />
+                           </div>
+                           <div class="col-lg-6 col-md-6 margintop15 containerClass  containerPortClass containerUpgradeDeploy" ng-show="">
+                              <label>Container Port:<span class="redSpan">*</span>
+                              </label>
+                              <input id="containerPort" type="text" class="form-control" name="">
+                           </div>
+                           <div class="col-lg-6 col-md-6 margintop15 containerClass hostPortClass containerUpgradeDeploy" ng-show="">
+                              <label>Host Port:<span class="redSpan">*</span>
+                              </label>
+                              <input id="hostPort" type="text" class="form-control" />
+                           </div>
+                           <div class="col-lg-6 col-md-6 margintop15 containerClass dockerUserClass containerUpgradeDeploy" ng-show="">
+                              <label>User Name:
+                              </label>
+                              <input id="dockerUser" type="text" class="form-control" />
+                           </div>
+                           <div class="col-lg-6 col-md-6 margintop15 containerClass dockerPasswordClass containerUpgradeDeploy" ng-show="">
+                              <label>Password:
+                              </label>
+                              <input id="dockerPassword" type="text" class="form-control" />
+                           </div>
+                           <div class="col-lg-6 col-md-6 margintop15 containerClass dockerEmailIdClass containerUpgradeDeploy" ng-show="">
+                              <label>Email ID:
+                              </label>
+                              <input id="dockerEmailId" type="text" class="form-control" />
+                           </div>
+                           <hr/>
+                           <div class="col-md-12 col-sm-12 col-xs-12 col-lg-12 applicationUrl-text">
+                              <span class="lable-align"><b>Application URL</b></span>
+                              <button type="button" class="btn btn-xs cat-btn-update pull-right appCreateBtn" ng-click="createAppUrl('new');"><i class="fa fa-plus white"></i>&nbsp;New</button>
+                              <table class="table table-striped table-bordered table-hover dataTable no-footer">
+                                 <thead>
+                                    <tr class="rowCustomStyle" role="row">
+                                       <td class="sorting_disabled" rowspan="1" colspan="1" aria-label="S.No">S.No</td>
+                                       <td class="sorting_disabled" rowspan="1" colspan="1" aria-label="Name">Name</td>
+                                       <td class="sorting_disabled" rowspan="1" colspan="1" aria-label="URL">URL</td>
+                                       <td class="sorting_disabled" rowspan="1" colspan="1" aria-label="Action">Action</td>
+                                    </tr>
+                                 </thead>
+                                 <tbody>
+                                    <tr ng-repeat="appUrl in bpCreate.appUrlList">
+                                       <td>{{$index + 1}}</td>
+                                       <td>{{appUrl.name}}</td>
+                                       <td><a class="app-url cursor" target="_blank" ng-href="{{appUrl.url}}">{{appUrl.url}}</a></td>
+                                       <td><button type="button" ng-click="removeAppUrl(appUrl);"><i class=" fa fa-trash-o"></i></button></td>
+                                    </tr>
+                                 </tbody>
+                              </table>
+                           </div>
+                        </accordion-group>
+                        <!--adding new collapse-->
+                        <accordion-group ng-if="templateSelected.templatetypename ==='CloudFormation'" ng-init="accGroupStatus = {opened: false}" is-open="accGroupStatus.opened">
+                           <accordion-heading>
+                              <i class="fa fa-fw" ng-class="{'fa-minus-circle red':accGroupStatus.opened,'fa-plus-circle':!accGroupStatus.opened }"></i>
+                              Configure Stack Parameters
+                           </accordion-heading>
+                           <div class="col-lg-6 col-md-6">
+                              <label for="orgnameSelect">Choose Provider <span class="red">&nbsp;*</span>
+                                 <span ng-show="newBlueprintForm.providerId.$touched && newBlueprintForm.providerId.$invalid" class="inputValidationMsg">Required</span>
+                              </label>
+                              <select ng-model="bpCreate.newEnt.providers" name="providerId" class="chooseOSProvider width-100 form-control" ng-change="bpCreate.getProviderImage();" ng-disabled="isOSImage" required>
+                                 <option value="">Select Provider</option>
+                                 <option ng-repeat="providerDetail in bpCreate.providerListing" value="{{providerDetail._id}}">{{providerDetail.providerName}}</option>
+                              </select>
+                           </div>
+                           <div class="col-lg-6 col-md-6">
+                              <label for="region">Choose Region:<span class="red">&nbsp;*</span>
+                                 <span ng-show="newBlueprintForm.region.$touched && newBlueprintForm.region.$invalid" class="inputValidationMsg">Required</span>
+                                 <loading size="small" name="isRegionKeyPairLoading" type="inline"></loading>
+                              </label>
+                              <select ng-model="bpCreate.newEnt.region" name="region" class="chooseSecurity width-100 form-control" required>
+                                 <option value="">Select Region</option>
+                                 <option value="{{bpCreate.regionListing}}">{{bpCreate.regionListing}}</option>
+                              </select>
+                           </div>
+                           <div class="col-lg-6 col-md-6 margintop15" ng-repeat="(key,value) in bpCreate.getCFTDetails.Parameters">
+                              <label for="cftResources">{{key}}<span class="red">&nbsp;*</span>&nbsp;&nbsp;<span title="{{value.Description}}"><i class="fa fa-question-circle"></i></span></label>
+                              <input type="text" name="resource" ng-model="value.Default" class="form-control"/>
+                           </div>
+                           <div class="accordionClear"></div>
+                           <br/>
+                           <accordion ng-repeat="(key,value) in bpCreate.getCFTDetails.Resources">
+                              <accordion-group ng-init="accGroupStatus = {opened: false}" is-open="accGroupStatus.opened">
+                                 <accordion-heading>
+                                    <i class="fa fa-fw" ng-class="{'fa-minus-circle red':accGroupStatus.opened,'fa-plus-circle':!accGroupStatus.opened }"></i>
+                                    Configure Resource : {{key}}
+                                 </accordion-heading>
+                                 <div class="col-lg-6 col-md-6 margintop15">
+                                    <label for="cftUserName">Instance Username<span class="red">&nbsp;*</span></label>
+                                    <input type="text" ng-model="bpCreate.newEnt.cftModelResources[key]" name="cftUserName" class="form-control"/>
+                                 </div>
+                                 <div class="col-lg-6 col-md-6 col-sm-6 col-xs-12">
+                                    <span class="cursor pull-right">
+                                       <i class="fa fa-plus-circle cursor" title="Edit Runlist" ng-click="updateCookbook()"></i>
+                                    </span>
+                                    <div class="view-runlist">
+                                       <table class="table table-bordered text-center">
+                                          <thead>
+                                             <tr>
+                                                <th class="text-center">View Runlist</th>
+                                             </tr>
+                                          </thead>
+                                          <!-- <tbody>
+                                             <tr ng-repeat="item in templateSelected.templatescookbooks.split(',')">
+                                                <td>{{item}}</td>
+                                             </tr>
+                                          </tbody> -->
+                                       </table>
+                                    </div>
+                                 </div>
+                              </accordion-group>
+                           </accordion>
+                        </accordion-group>
+                     </accordion>
+                  </div>
+               </div>
+            </form>
+         </div>
+      </div>
+   </div>
+   <div class="pager">
+      <button class="btn  cat-btn-update" ng-click="previous()" ng-disabled="!previousEnabled" ng-show="!isSubmitComposite">Previous</button>
+      <button class="btn cat-btn-update" ng-show="isNextVisible" ng-click="next()" ng-disabled="!nextEnabled">Next</button>
+      <button class="btn  cat-btn-update" ng-show="isSubmitVisible" ng-disabled="newBlueprintForm.$invalid" ng-click="submit()">Save</button>
+      <button class="btn  cat-btn-update" ng-show="isSubmitComposite" ng-disabled="compositeBlueprintCreation.$invalid" ng-click="compositeSave()">Save</button>
+   </div>
+</div>
diff --git a/client/cat3/src/partials/sections/dashboard/design/view/createComposite.html b/client/cat3/src/partials/sections/dashboard/design/view/createComposite.html
new file mode 100644
index 000000000..214400814
--- /dev/null
+++ b/client/cat3/src/partials/sections/dashboard/design/view/createComposite.html
@@ -0,0 +1,164 @@
+<!--for showing existing blueprints-->
+<div ng-controller="createCompositeCtrl as createCBP">
+    <div id="well" class="well well-sm">
+        <div class="col-lg-8 col-md-8">
+            Composite Blueprint:
+        </div>
+        <div class="col-lg-4 col-md-4 pull-right" >
+            <button type="button" class="btn btn-xs cat-btn-update ng-scope pull-right margin-left6" ng-click="isOpenSidebar = !isOpenSidebar">
+                <i class="fa fa-filter fa-2 white" aria-hidden="true"></i>&nbsp;Filter
+            </button>
+        </div>
+    </div>
+    <div id="sidebar-wrapper" ng-class="{'show-wrapper':isOpenSidebar === true}">
+        <form>
+            <fieldset class="repo-job-details-wrapper">
+                <legend class="repo-job-details-wrapper-inner">Filter:</legend>
+                <div class="col-lg-12 ">
+                    <div class="col-lg-12 col-md-12 form-group">
+                        <label for="">Business Group</label>
+                        <select id="bgListInputExisting" class="chooseBGExisting width-100 form-control"  ng-model="organNewEnt.buss">
+                            <option ng-repeat="buss in organObject[organNewEnt.org].businessGroups" value="{{organObject[organNewEnt.org].businessGroups.indexOf(buss)}}" >{{buss.name}}</option>
+                        </select>
+                    </div>
+                    <div class="col-lg-12 col-md-12 form-group">
+                        <label >Project</label>
+                        <select class="chooseProjectExisting width-100 form-control" ng-model="organNewEnt.proj">
+                            <option ng-repeat="proj in organObject[organNewEnt.org].businessGroups[organNewEnt.buss].projects"  value="{{organObject[organNewEnt.org].businessGroups[organNewEnt.buss].projects.indexOf(proj)}}" >{{proj.name}}</option>
+                        </select>
+                    </div>
+                    <div class="col-lg-12 col-md-12 form-group">
+                        <button type="button" class="btn btn-primary"  ng-click="createCBP.createList();"><i class="fa fa-filter fa-2 white" aria-hidden="true"></i>&nbsp;Apply</button>
+                    </div>
+                </div>
+            </fieldset>
+        </form>
+    </div>
+
+<br>
+<fieldset id="compBlueprint" class="repo-job-details-wrapper" >
+
+    <div class="form-group">
+        <label class="control-label col-sm-2 labelHorizontal" for="blueprintNameInputComposite">Enter Blueprint Name<span class=" red">&nbsp;*</span></label>
+        <div class="col-sm-8 blueprintName"> <input ng-model="createCBP.newEnt.bpName" type="text" name="coBlueprintName"  class="required form-control"  required style="width: 60%;" />
+            <span class="error red" ng-show="createCBP.onSubmit && compositeBlueprintCreation.coBlueprintName.$invalid"> Please enter Composite Blueprint name!</span>
+        </div>
+    </div>
+    <div style="clear: both;"></div>
+   <br />
+    <div id="compositeDivision" class="margin-top5">
+        <div id="compositeBlueprintLoadBlueprint">
+            <div id="compositeBlueprintSelector" >
+                <div class="col-lg-6 col-md-6 col-sm-12">
+                    <div class="panel-group">
+                        <div class="panel panel-default">
+                            <div class="panel-heading" style="height: 40px;">
+                                <div class="search">
+                                    <div class="col-lg-6 col-md-6 col-sm-6">
+                                        <label for="search-input"><i class="fa fa-search" aria-hidden="true"></i><span class="sr-only">Search</span></label>
+                                        <input ng-model="searchText.name" class="search-input" class="form-control input-lg" placeholder="Search" autocomplete="off" spellcheck="false" autocorrect="off" tabindex="1">
+                                        <a id="search-clear" href="#" class="fa fa-times-circle hide" aria-hidden="true"><span class="sr-only">Clear search</span></a>
+                                    </div>
+                                    <div class="col-lg-6 col-md-6 col-sm-6">&nbsp;
+                                        <select class="form-control bp-select pull-right" ng-change="createCBP.createList();" ng-model="createCBP.compositeBPType">
+                                            <option value="chef" >SoftwareStack </option>
+                                            <option value="docker">Docker</option>
+                                        </select>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="panel-body bp-panel-body">
+                                <span class="red" ng-if=" createCBP.ExBlueprintList.length === 0 && createCBP.SelectedBPList.length === 0">No Data Found!</span>
+                                <ul class="list-group" ui-sortable>
+                                    <li class="list-group-item" ng-repeat="bp in createCBP.ExBlueprintList | filter :searchText">
+                                        <span class="badge cat-btn-update" ng-click="createCBP.addBP(createCBP.ExBlueprintList.indexOf(bp))" ><i class="fa fa-arrow-right white fa-2" aria-hidden="true"></i></span>
+                                        <span class="badge cat-btn-update" ng-click="createCBP.selectBpInfo($event,bp)" ><i class="fa fa-info fa-2 white" aria-hidden="true"></i></span>
+                                        <img src="./images/rsz_layers.png" alt="Zabix and Logstash"> &nbsp;{{bp.name}}
+                                    </li>
+                                </ul>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-lg-6 col-md-6 col-sm-12">
+                    <div class="panel-group">
+                        <div class="panel panel-default">
+                            <div class="panel-heading" style="height: 40px;">
+                                <input type="hidden" ng-model="createCBP.newEnt.blueprintIds" >
+                               <span>Selected Blueprints</span> &nbsp; <span class="error red" ng-show="createCBP.onSubmit && createCBP.SelectedBPList.length <= 0">Please select blueprint.</span>
+                            </div>
+                            <div class="panel-body bp-panel-body">
+                                <ul class="list-group" dnd-list="createCBP.SelectedBPList" >
+                                    <li class="list-group-item bpListComp"  ng-repeat="selectedp in createCBP.SelectedBPList" dnd-draggable="selectedp"
+                                        dnd-moved="createCBP.SelectedBPList.splice($index, 1)"
+                                        dnd-effect-allowed="move"
+                                        dnd-selected="models.selected = selectedp"  ng-class=" {'activeLi':createCBP.selectBlueprintId === selectedp._id}">
+                                        <span class="badge cat-btn-update" ng-click="createCBP.editSelectBpInfo($event,selectedp)" ><i class="fa fa-pencil-square-o fa-2 white" aria-hidden="true"></i></span>
+                                        <span class="badge cat-btn-update" ng-click="createCBP.selectBpInfo($event,selectedp)" ><i class="fa fa-info fa-2 white" aria-hidden="true"></i></span>
+                                        <span class="badge cat-btn-update" ng-click="createCBP.deSelect($event,createCBP.SelectedBPList.indexOf(selectedp))" ><i class="fa fa-arrow-left fa-2 white" aria-hidden="true"></i></span>
+                                        <span class="badge pull-left" >{{(+createCBP.SelectedBPList.indexOf(selectedp)) +1}}</span><img src="./images/rsz_layers.png" alt="Zabix and Logstash"> &nbsp;{{selectedp.name}}
+                                    </li>
+                                </ul>
+                                
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+            </div>
+        </div>
+    </div>
+    <div style="clear: both;"></div>
+    <!--for showing no blueprints available-->
+    <label id="npbpmsgComposite" class="npbpmsg hidden">No blueprints found</label>
+    <!--edit attribute-->
+    <div class="col-lg-12" ng-show="createCBP.SelectedBPList.length >0 && createCBP.selectBlueprintId">
+        <accordion>
+                <accordion-group ng-init="accGroupStatus = {opened: false}" is-open="accGroupStatus.opened">
+                    <accordion-heading>
+                        <i class="fa fa-fw" ng-class="{'fa-minus-circle red':accGroupStatus.opened,'fa-plus-circle':!accGroupStatus.opened }"></i>
+                        Edit attribute of Composed Roles and Cookbooks
+                    </accordion-heading>
+                    <div class="panel-body" id="attributeRunlistTable">
+                        <div class="col-lg-8 col-md-8 marginTop19">
+                            <label>
+                                <i class="ace-icon fa fa-list-ul"></i>
+                                Runlist
+                            </label>
+                            <div style="height:146px;overflow-y:auto; overflow-x:hidden;" id="dbNameTable_wrapper" class="dataTables_wrapper no-footer">
+                                <div class="dataTables_wrapper no-footer">
+                                    <div  class="dataTables_wrapper no-footer">
+                                        <table class="table table-striped table-bordered table-hover dataTable no-footer" cellpadding="5px" width="100%" role="grid" style="width: 100%;">
+                                        <thead>
+                                            <tr class="rowCustomStyle" role="row">
+                                                <th class="sorting_disabled" rowspan="1" colspan="1" style="width: 395px;">View Runlist</th>
+                                                <th class="sorting_disabled" rowspan="1" colspan="1" style="width: 395px;">Cookbook Attributes</th>
+                                            </tr>
+                                        </thead>
+                                        <tbody>
+                                            <tr class="runlistRow" ng-if="createCBP.selectedBPDetails.blueprintConfig.infraManagerData.versionsList.length === 0">
+                                                <td collapse="2">No data available</td>
+                                            </tr>
+                                            <tr class="runlistRow" ng-repeat="(key,value) in createCBP.selectedBPDetails.blueprintConfig.infraManagerData.versionsList[0].runlist">
+                                                <td>{{value}}</td>
+                                                <td>
+                                                    <span title="edit" class="badge cat-btn-update" ng-click="createCBP.editSelectBpInfo($event,selectedp)" ><i class="fa fa-pencil-square-o fa-2 white" aria-hidden="true"></i></span>
+                                                    <span title="view" class="badge cat-btn-update" ng-click="createCBP.editSelectBpInfo($event,selectedp)" ><i class="fa fa-info fa-2 white" aria-hidden="true"></i></span></td>
+                                            </tr>
+                                        </tbody>
+                                        </table>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </accordion-group>
+        </accordion>
+    </div>
+</fieldset>
+</div>
+<style>
+    .pager{
+       margin: 0 !important;
+    }
+</style>
\ No newline at end of file
diff --git a/client/cat3/src/partials/sections/dashboard/design/view/designListView.html b/client/cat3/src/partials/sections/dashboard/design/view/designListView.html
new file mode 100644
index 000000000..39301e1d7
--- /dev/null
+++ b/client/cat3/src/partials/sections/dashboard/design/view/designListView.html
@@ -0,0 +1,75 @@
+<div ng-controller="blueprintListCtrl as bpList" >
+<div id="well" class="well well-sm">
+    <div class="col-lg-8 col-md-8">
+        <b><i>{{stateItems.params.templateObj.templatetypename}} blueprints</i></b> <!--<span ng-if="bpList.selectedCards.length > 0"> : - <span class="badge">{{bpList.selectedCards.length}}</span> Selected Blueprints </span>-->
+    </div>
+    <div class="col-lg-4 col-md-4 pull-right" >
+        <button ng-show="stateItems.params.templateObj.templatetypename !== 'Composite'" type="button" class="btn btn-xs cat-btn-update ng-scope pull-right margin-left6" ng-click="bpList.viewTypeList = !bpList.viewTypeList">
+           <sapn ng-if="bpList.viewTypeList === false ">&nbsp;<i class="fa fa-list fa-2 white" aria-hidden="true"></i>&nbsp;</sapn>
+            <sapn ng-if="bpList.viewTypeList === true">&nbsp;<i class="fa fa-th-large white" aria-hidden="true"></i>&nbsp;</sapn>
+        </button>
+            <button type="button" class="btn btn-xs cat-btn-update ng-scope pull-right margin-left6" ng-click="isOpenSidebar = !isOpenSidebar">
+                <i class="fa fa-filter fa-2 white" aria-hidden="true"></i>&nbsp;Filter
+            </button>
+            <button type="button" class="btn btn-xs cat-btn-update ng-scope pull-right margin-left6" >&nbsp;<i class="fa fa-refresh fa-2 white" aria-hidden="true"></i>&nbsp;</button>
+            <button type="button" class="btn btn-xs cat-btn-update ng-scope pull-right margin-left6" ng-if="bpList.selectedCards.length > 0 && bpList.viewTypeList === false" ng-click="bpList.deleteBp(bpList.selectedCards)" ><i class="fa fa-trash-o fa-2 white" aria-hidden="true"></i>&nbsp;Delete</button>
+            <button type="button" class="btn btn-xs cat-btn-update ng-scope pull-right margin-left6" ng-if="bpList.selectedCards.length > 0 && bpList.viewTypeList === false" ng-click="bpList.copyBp(bpList.selectedCards)" ><i class="fa fa-clone fa-2 white" aria-hidden="true"></i>&nbsp;Copy</button>
+    </div>
+</div>
+<div class="col-lg-12">
+    <br>
+    <div ng-if="bpList.pager.totalRecords <= 0" class="alert alert-info text-center"> No Data Found!</div>
+    <div ng-show="stateItems.params.templateObj.templatetypename === 'Composite'">
+        <div ng-repeat="blueprint in bpList.blueprintList.card" ng-init="bpList[blueprint._id]= false " style="width: 160px; margin: auto; padding: 0px;position: relative; float: left;">
+            <div class="anm" style="background: #FFF; position: absolute; z-index: 1;width: 100%; bottom: 0px;margin: 0 8px;"></div>
+            <div class="productdiv4" id="{{blueprint._id}}" >
+            <div class="productdiv1 cardimage" ng-class="{'selected' :bpList[blueprint._id] === true }" >
+                <ul class="list-unstyled system-prop" style="text-align: center;" ng-click="bpList.selectCard(blueprint);">
+                    <li title="Zabix and Logstash" class="Cardtextoverflow"><h5>{{blueprint.name}}</h5></li>
+                    <li>
+                        <img src="./images/composite.png" alt="Zabix and Logstash" class="cardLogo">
+                    </li>
+                    <hr class="blue-hr"/>
+                    <button class="btn btn-xs cat-btn-update bpvicon " title="Edit" ng-click="desSubItm.editBlueprint($event,blueprint.id);"><i class="fa fa-pencil fa-2 white"></i></button>
+                    <button class="btn btn-xs cat-btn-update bpvicon pull-right" title="Launch" ng-click="bpList.launchInstance($event,blueprint.id);"><i class="fa fa-location-arrow fa-2 white"></i></button>
+                    <button class="btn btn-xs cat-btn-update bpvicon pull-left" title="Info" ng-click="bpList.blueprintInfo($event,blueprint,'compBlueInfo')"><i class="fa fa-info fa-2 white"></i></button>
+                </ul>
+
+            </div>
+        </div>
+            </div>
+    </div>
+
+    <div ng-show="stateItems.params.templateObj.templatetypename !== 'Composite'">
+        <div ng-show="bpList.pager.totalRecords > 0 && bpList.viewTypeList === false">
+            <div ng-repeat="blueprint in bpList.blueprintList.card" ng-init="bpList[blueprint._id]= false " style="width: 160px; margin: auto; padding: 0px;position: relative; float: left;">
+            <div class="anm" style="background: #FFF; position: absolute; z-index: 1;width: 100%; bottom: 0px;margin: 0 8px;"></div>
+            <div class="productdiv4" id="{{blueprint._id}}" >
+                <div class="productdiv1 cardimage" ng-class="{'selected' :bpList[blueprint._id] === true }" >
+                    <ul class="list-unstyled system-prop" style="text-align: center;" ng-click="bpList.selectCard(blueprint);">
+                        <li title="Zabix and Logstash" class="Cardtextoverflow"><h5>{{blueprint.name}}</h5></li>
+                        <li class="cardLogo">
+                            <img ng-src="./images/templateicons/appFact6.png" alt="softwareStack" >
+                        </li>
+                        <!--<li class="margin-top5">Version:&nbsp;-->
+                            <!--<select class="blueprintVer">-->
+                                <!--<option >1</option>-->
+                            <!--</select>-->
+                        <!--</li>-->
+                        <hr class="blue-hr"/>
+                        <button class="btn btn-xs cat-btn-update bpvicon " title="Edit" ng-click="bpList.editBlueprint($event,blueprint._id);"><i class="fa fa-pencil fa-2 white"></i></button>
+                        <button class="btn btn-xs cat-btn-update bpvicon pull-right" title="Launch" ng-click="bpList.launchInstance($event,blueprint._id);"><i class="fa fa-location-arrow fa-2 white"></i></button>
+                        <button class="btn btn-xs cat-btn-update bpvicon pull-left" title="Info" ng-click="bpList.blueprintInfo($event,blueprint,null)"><i class="fa fa-info fa-2 white"></i></button>
+                    </ul>
+
+                </div>
+            </div>
+            </div>
+        </div>
+        <div ng-if="bpList.pager.totalRecords > 0 && bpList.viewTypeList === true">
+            <div ui-grid="bpList.blueprintList.list" ui-grid-auto-resize ui-grid-resize-columns ui-grid-pagination class="bp-list-grid " ></div>
+        </div>
+    </div>
+</div>
+    <span ng-if="stateItems.params.view === 'list'"  ng-include="'src/partials/sections/dashboard/design/view/filterSidebar.html'"></span>
+</div>
diff --git a/client/cat3/src/partials/sections/dashboard/design/view/designSubMenu.html b/client/cat3/src/partials/sections/dashboard/design/view/designSubMenu.html
new file mode 100644
index 000000000..e18d503eb
--- /dev/null
+++ b/client/cat3/src/partials/sections/dashboard/design/view/designSubMenu.html
@@ -0,0 +1,37 @@
+<!--<div id='navigPage'>-->
+    <!--<div id='navigPage-inner'>-->
+        <!--<nav  id="deisgn" ng-controller="designCtrl">-->
+        <!--<ul class="menu-item-parentdemo" >-->
+            <!--<li class="open active">-->
+                <!--<ul class="visibleClass" style="">-->
+                    <!--<li ng-class="{'active':stateItems.params.subItem === menuItem.name}"  ng-repeat="menuItem in providersMenu">-->
+                        <!--<a  ui-sref="dashboard.designSubView({subItem:menuItem.name,view:'list'})" class="devops_providers">-->
+                            <!--<div class="aws" title="AWS"><span class="menu-item-parent provider-images trackAlign">&nbsp;&nbsp;{{menuItem.name}}</span></div>-->
+                        <!--</a>-->
+                    <!--</li>-->
+                <!--</ul>-->
+            <!--</li>-->
+        <!--</ul>-->
+        <!--</nav>-->
+    <!--</div>-->
+<!--</div>-->
+
+<ul class="nav nav-pills nav-stacked left-menu" id="stacked-menu" ng-controller="designCtrl">
+    <li ng-repeat="provider in providersMenu" >
+        <a ng-class="{'active':stateItems.params.subItem === provider.name}" data-target="#{{provider.name}}" data-toggle="collapse" data-parent="#stacked-menu">
+            <img src="./images/providers/{{provider.icon}}"> &nbsp;{{provider.name}}<span class="caret arrow"></span></a>
+        <ul class="nav nav-stacked collapse left-submenu" id="{{provider.name}}">
+            <li ng-repeat='tempType in templateTypes | inArray:provider.filterArray:"templatetype"'>
+                <a ng-class="{'active':stateItems.params.subItem === provider.name && stateItems.params.templateObj._id === tempType._id }" ui-sref="dashboard.designSubView({subItem:provider.name,view:'list',templateObj:tempType})" >
+                   <span ng-switch="tempType.templatetype" >
+                        <img ng-switch-when="chef" src="/d4dMasters/image/16ae9c94-19f6-485a-8c17-9af7a0f5f23d__designtemplateicon__Appfactory.png" />
+                        <img ng-switch-when="ami" src="/d4dMasters/image/9d14d362-493e-4d62-b029-a6761610b017__designtemplateicon__DevopsRoles.png" />
+                        <img ng-switch-when="docker" src="/d4dMasters/image/b02de7dd-6101-4f0e-a95e-68d74cec86c0__designtemplateicon__Docker.png" />
+                       <img ng-switch-when="cft" src="/d4dMasters/image/4fdda07b-c1bd-4bad-b1f4-aca3a3d7ebd9__designtemplateicon__Cloudformation.png" />
+                       <img ng-switch-when="arm" src="/d4dMasters/image/4fdda07b-c1bd-4bad-b1f4-aca3a3d7ebd9__designtemplateicon__Cloudformation.png" />
+                       <img ng-switch-when="composite" src="./images/composite.png" />
+                   </span>
+                    &nbsp;{{tempType.templatetypename}}</a></li>
+        </ul>
+    </li>
+</ul>
\ No newline at end of file
diff --git a/client/cat3/src/partials/sections/dashboard/design/view/filterSidebar.html b/client/cat3/src/partials/sections/dashboard/design/view/filterSidebar.html
new file mode 100644
index 000000000..ae93a094e
--- /dev/null
+++ b/client/cat3/src/partials/sections/dashboard/design/view/filterSidebar.html
@@ -0,0 +1,24 @@
+<div id="sidebar-wrapper" ng-class="{'show-wrapper':isOpenSidebar === true}">
+    <form>
+        <fieldset class="repo-job-details-wrapper">
+            <legend class="repo-job-details-wrapper-inner">Filter:</legend>
+            <div class="col-lg-12 ">
+                <div class="col-lg-12 col-md-12 form-group">
+                    <label for="">Business Group</label>
+                    <select id="bgListInputExisting" class="chooseBGExisting width-100 form-control"  ng-model="organNewEnt.buss">
+                        <option ng-repeat="buss in organObject[organNewEnt.org].businessGroups" value="{{organObject[organNewEnt.org].businessGroups.indexOf(buss)}}" >{{buss.name}}</option>
+                    </select>
+                </div>
+                <div class="col-lg-12 col-md-12 form-group">
+                    <label >Project</label>
+                    <select class="chooseProjectExisting width-100 form-control" ng-model="organNewEnt.proj">
+                        <option ng-repeat="proj in organObject[organNewEnt.org].businessGroups[organNewEnt.buss].projects"  value="{{organObject[organNewEnt.org].businessGroups[organNewEnt.buss].projects.indexOf(proj)}}" >{{proj.name}}</option>
+                    </select>
+                </div>
+                <div class="col-lg-12 col-md-12 form-group">
+                    <button type="button" class="btn btn-primary" ng-click="bpList.createList();"><i class="fa fa-filter fa-2 white" aria-hidden="true"></i>&nbsp;Apply</button>
+                </div>
+            </div>
+        </fieldset>
+    </form>
+</div>
\ No newline at end of file
diff --git a/client/cat3/src/partials/sections/dashboard/design/view/popups/blueprintCopy.html b/client/cat3/src/partials/sections/dashboard/design/view/popups/blueprintCopy.html
new file mode 100644
index 000000000..23820ad36
--- /dev/null
+++ b/client/cat3/src/partials/sections/dashboard/design/view/popups/blueprintCopy.html
@@ -0,0 +1,40 @@
+
+    <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" ng-click="bpCopy.cancel()"><span aria-hidden="true">×</span><span class="sr-only">Close</span></button>
+        <h4 class="modal-title" id="myModalLabel"><i class="fa fa-list-ol txt-color-blue"></i>&nbsp;Select target</h4>
+    </div>
+    <div class="modal-body" style="height:232px;">
+        <form name="copyBP" novalidate>
+        <div class="bpcopyContainer">
+            <div class="col-lg-12 col-md-12">
+                <label for="">Organization
+                   <span style="color:red">*</span></label>
+                <select  ng-model="bpCopy.newEnt.copyOrg" class="chooseProjectExisting width-100 form-control" required>
+                    <option ng-repeat="org in organObject"  value="{{organObject.indexOf(org)}}" >{{org.name}}</option>
+                </select>
+            </div>
+
+
+            <div class="col-lg-12 col-md-12">
+                <label for="" class="lblbpc">Business Group   <span style="color:red">*</span></label>
+                <select id="bgListInputExisting" class="chooseBGExisting width-100 form-control"  ng-model="bpCopy.newEnt.copyBuss" required>
+                    <option ng-repeat="buss in organObject[bpCopy.newEnt.copyOrg].businessGroups" value="{{organObject[bpCopy.newEnt.copyOrg].businessGroups.indexOf(buss)}}" >{{buss.name}}</option>
+                </select>
+            </div>
+
+            <div class="col-lg-12 col-md-12">
+                <label class="lblbpc">Project  <span style="color:red">*</span>
+                </label>
+                <select class="chooseProjectExisting width-100 form-control" ng-model="bpCopy.newEnt.copyProj" required>
+                    <option ng-repeat="proj in organObject[bpCopy.newEnt.copyOrg].businessGroups[bpCopy.newEnt.copyBuss].projects"  value="{{organObject[bpCopy.newEnt.copyOrg].businessGroups[bpCopy.newEnt.copyBuss].projects.indexOf(proj)}}" >{{proj.name}}</option>
+                </select>
+            </div>
+
+        </div>
+            </form>
+    </div>
+    <div class="modal-footer" style="margin-top: 0px !important; padding-right: 8px; padding-top: 7px;">
+        <button type="button" class="btn cat-btn-close" ng-click="bpCopy.cancel()">
+            <i class="fa fa-times black"></i> Close</button>
+        <button type="button" class="btn cat-btn-update" data-dismiss="modal" ng-disabled="copyBP.$invalid" ng-click="bpCopy.copySelectedBlueprint();"><i class="fa fa-clone fa-2 white" aria-hidden="true"></i> Copy</button>
+    </div>
diff --git a/client/cat3/src/partials/sections/dashboard/design/view/popups/blueprintLaunch.html b/client/cat3/src/partials/sections/dashboard/design/view/popups/blueprintLaunch.html
new file mode 100644
index 000000000..cda51b860
--- /dev/null
+++ b/client/cat3/src/partials/sections/dashboard/design/view/popups/blueprintLaunch.html
@@ -0,0 +1,40 @@
+<div class="modal-header">
+    <span class="close" ng-click="lanIns.cancel()">×</span>
+    <h4 class="modal-title">
+        <i class="fa fa-bar-chart-o"></i> Launching Blueprint
+    </h4>
+</div>
+
+<div class="modal-body">
+    <form name="launchBP" novalidate>
+    <fieldset>
+        <div class="col-lg-6 col-md-6">
+            <label for="">Organization</label>
+            <input id="blueprintOrgEnv" ng-model="lanIns.newEnt.org" disabled="disabled" class="form-control">
+        </div>
+        <div class="col-lg-6 col-md-6">
+            <label for="" class="">Business Group</label>
+            <input id="blueprintBuEnv" ng-model="lanIns.newEnt.buss" disabled="disabled" class="form-control">
+        </div>
+        <div class="col-lg-6 col-md-6 projectRepo">
+            <label for="" class="">Project Name
+            </label>
+            <input id="blueprintProEnv" ng-model="lanIns.newEnt.proj" disabled="disabled" class="form-control">
+        </div>
+        <div class="col-lg-6 col-md-6 projectRepo">
+            <label for="" class="">Choose Environment:<span class="red">*</span></label>
+            <label id="spinnerForEnv" class="hidden"><img style="margin-left:5px;margin-right:25px;" src="img/select2-spinner.gif"></label>
+            <select id="envSelect" ng-model="lanIns.newEnt.env" class="width-100 form-control" required>
+                <option value="">Select</option>
+                <option ng-repeat="envOption in lanIns.envOptions" value="{{envOption.rowid}}">{{envOption.name}}</option>
+            </select>
+        </div>
+        <input type="hidden" id="selectedVersion" value="578775ea942b1fbf345932ff">
+    </fieldset>
+        </form>
+</div>
+<div class="modal-footer">
+    <button type="button" class="btn cat-btn-close" ng-click="lanIns.cancel()">
+        <i class="fa fa-times black"></i> Close</button>
+    <button type="button" class="btn cat-btn-update" data-dismiss="modal" ng-disabled="launchBP.$invalid" ng-click="lanIns.launch();">Launch</button>
+</div>
\ No newline at end of file
diff --git a/client/cat3/src/partials/sections/dashboard/genericServices.js b/client/cat3/src/partials/sections/dashboard/genericServices.js
index deb223b28..82401b9f7 100644
--- a/client/cat3/src/partials/sections/dashboard/genericServices.js
+++ b/client/cat3/src/partials/sections/dashboard/genericServices.js
@@ -130,23 +130,6 @@
                 });
             }
         };
-        $rootScope.showTreeMenu = true;
-        genericServices.hideTreeOverlay = function () {
-            $rootScope.showTreeMenu = false;
-            $(".panelRight").css("width", "calc(100% - 39px)");
-            $("#navigPage").addClass("tree-close");
-            $(".minifyme").css("left", "0px");
-            $(".minifyme").css("border-radius", "0px");
-            $(".minifyme").css("width", "35px");
-        };
-        genericServices.showTreeOverlay = function () {
-            $rootScope.showTreeMenu = true;
-            $(".panelRight").css("width", "calc(100% - 258px)");
-            $("#navigPage").removeClass("tree-close");
-            $(".minifyme").css("left", "216px");
-            $(".minifyme").css("width", "38px");
-            $(".minifyme").css("border-radius", "5px 0 0 5px");
-        };
         /*genericServices.editRunlist = function(chefRunlist, chefAttribute) {
             $modal.open({
                 templateUrl: 'src/partials/sections/dashboard/workzone/orchestration/popups/orchestrationUpdateChefRunlist.html',
diff --git a/client/cat3/src/partials/sections/dashboard/workzone/instance/instance.scss b/client/cat3/src/partials/sections/dashboard/workzone/instance/instance.scss
index 98acdcc1a..756d953b2 100644
--- a/client/cat3/src/partials/sections/dashboard/workzone/instance/instance.scss
+++ b/client/cat3/src/partials/sections/dashboard/workzone/instance/instance.scss
@@ -607,6 +607,14 @@ $imagePath: "../../../../../../images";
     }
 }
 @media (min-width: 768px) and (max-width: 991px) {
+    .box.box-default.instance-filter.active {
+        height: 250px;
+    }
+
+    .box.box-default.instance-filter .box-body .cat-btn-update {
+        float: right;
+    }
+
     #assignJobPage {
         #container {
             .left-right-selection {
diff --git a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html
index 855fd7d89..84af3ec9f 100644
--- a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html
+++ b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html
@@ -15,7 +15,7 @@ <h4 class="modal-title" ng-if="isEditMode">
 		<div class="modal-body">
 			<loading name="isNewTaskPageLoading" size="large" type="block" align="center"></loading>
 			<div class="row new-task-wrapper" ng-show="!isNewTaskPageLoading">
-				<div class="col-lg-4 col-md-4 col-sm-12 col-xs-12 border no-padding">
+				<div class="col-lg-5 col-md-5 col-sm-12 col-xs-12 border no-padding">
 					<section class="jobDetailsBox">
 						<header class="jobDetailsHeader">
 							<h5>Job Details</h5>
@@ -49,6 +49,38 @@ <h5>Job Details</h5>
 								   <input type="text" name="taskName" class="form-control" required autofocus ng-model="name" maxlength="50" />
 								</span>
 							</div>
+							<div class="col-md-12 col-sm-12 col-xs-12 margintop15">
+								<label class="control-label">Add to Service Delivery : </label>
+								<input type="checkbox" class="checkbox-list" ng-model="checkBotType" ng-click="botStatus()"/>
+							</div>
+							<div class="col-md-6 col-sm-6 col-xs-6 " ng-show="checkBotStatus">
+								<label class="control-label">Bot Type
+									<span class="control-label red">&nbsp;*</span>
+									<span ng-show="newTaskForm.botType.$touched && newTaskForm.botType.$invalid" class="inputValidationMsg">required
+									</span>
+								</label>
+								<br />
+								<span class="col-md-12 col-sm-12 col-xs-12 no-padding">
+									<select name="botType" class="form-control" ng-model="botType" ng-required="checkBotStatus" ng-disabled="isEditMode">
+										<option selected="selected" value="Task">Task</option>
+										<option ng-show="!createChefJob" value="Check">Check</option>
+										<option ng-show="!createChefJob" value="Learning">Learning</option>
+										<option ng-show="!createChefJob" value="Composite">Composite</option>
+										<option ng-show="!createChefJob" value="Built with other">Built with other</option>
+									</select>
+								</span>
+							</div>
+							<div class="col-lg-6 col-md-6 col-sm-6 col-xs-6 " ng-show="checkBotStatus">
+								<label class="control-label">Short Description
+									<span class="control-label red">&nbsp;*</span>
+									<span ng-show="newTaskForm.shortDesc.$touched && newTaskForm.shortDesc.$invalid" class="inputValidationMsg">required
+									</span>
+								</label>
+								<br />
+								<span class="col-md-12 col-sm-12 col-xs-12 no-padding">
+								   <input type="text" name="shortDesc" class="form-control" ng-required="checkBotStatus"  autofocus ng-model="shortDesc" maxlength="50" />
+								</span>
+							</div>
 							<div class="col-md-6 col-sm-6 col-xs-6 margintop15" ng-if="taskType==='jenkins'">
 								<label class="control-label">Server
 									<span class="control-label red">&nbsp;*</span>
@@ -106,7 +138,7 @@ <h5>Job Details</h5>
 								</div>
 							</div>
 							<!--scriptType ending here -->
-							<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 margintop15">
+							<div class="col-lg-12 col-md-12col-sm-12 col-xs-12 margintop15">
 								<label class="control-label">Job Description</label>
 								<textarea id="chefDescription" rows="9" cols="15" name="description" ng-model="description"></textarea>
 							</div>
@@ -114,7 +146,7 @@ <h5>Job Details</h5>
 					</section>
 				</div>
 				<!--Second Column:Chef -->
-				<div class="col-lg-8 col-md-8 col-sm-12 col-xs-12 left-padding">
+				<div class="col-lg-7 col-md-7 col-sm-12 col-xs-12 left-padding">
 					<div class="col-md-12 col-sm-12 col-xs-12 border no-padding" ng-if="taskType==='chef'">
 						<section class="Chef">
 							<header class="jobDetailsHeader">
@@ -122,7 +154,7 @@ <h5>Chef Server Details for - RLChefServer</h5>
 							</header>
 							<div class="jobDetailsContent">
 								<div class="chef-details-top">
-									<div class="col-lg-6 col-md-6 col-sm-6 col-xs-12">
+									<div class="col-lg-7 col-md-7 col-sm-7 col-xs-12">
 										<loading name="isTargetTypesLoading" size="medium" type="block" align="left"></loading>
 										<div ng-show="!isTargetTypesLoading" class="row margin0">
 
@@ -183,7 +215,7 @@ <h5>Chef Server Details for - RLChefServer</h5>
 
 										</div>
 									</div>
-									<div class="col-lg-6 col-md-6 col-sm-6 col-xs-12">
+									<div class="col-lg-5 col-md-5 col-sm-5 col-xs-12">
 										<label>
 											<i class="fa fa-list-ul addRunList-icon"></i>
 											<lable class="control-label" ng-if="!isEditMode">Add Runlist</lable>
diff --git a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTaskCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTaskCtrl.js
index 08e4bf308..2c1b5ddec 100644
--- a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTaskCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTaskCtrl.js
@@ -26,6 +26,14 @@
 				var toggleStatus = $scope.isAllSelected;
 				angular.forEach($scope.chefInstanceList, function(itm){ itm._isNodeSelected = toggleStatus;});
 			};
+			$scope.botStatus = function() {
+				if($scope.checkBotType){
+					$scope.checkBotStatus = true;
+				}else{
+					$scope.checkBotStatus = false;
+				}
+
+			};
 			$scope.optionToggled = function(){
 				$scope.isAllSelected = $scope.chefInstanceList.every(function(itm){ return  itm._isNodeSelected; })
 			};
@@ -244,13 +252,21 @@
 					}
 				},
 				ok: function () {
-					$scope.taskSaving = true;
 					//these values are common across all task types
 					var taskJSON = {
 						taskType: $scope.taskType,
 						name: $scope.name,
-						description: $scope.description,
+						botType: $scope.botType,
+						shortDesc: $scope.shortDesc,
+						description: $scope.description
 					};
+					if($scope.checkBotType){
+						taskJSON.botType = $scope.botType;
+						taskJSON.shortDesc= $scope.shortDesc;
+						$scope.taskSaving = true;
+					}else{
+						$scope.taskSaving = true;
+					}
 					//checking for name of the task
 					if (!taskJSON.name.trim()) {
 						$scope.inputValidationMsg='Please enter the name of the task.';
@@ -407,7 +423,9 @@
 				}
 			});
 			$scope.name = "";
+			$scope.shortDesc = "";
 			$scope.taskType = "chef";//default Task type selection;
+			$scope.botType = "Task";//default Task type selection;
 			$scope.isEditMode = false;//default edit mode is false;
 			$scope.taskSaving = false;//to disable submit button, dfault false
 			$scope.autoSync = {
@@ -435,7 +453,6 @@
 			workzoneServices.getEnvironmentTaskList().then(function (response) {
 				var data, selectorList = [],
 					optionList = [];
-
 				if (response.data) {
 					data = response.data;
 				} else {
@@ -563,6 +580,12 @@
 				$scope.description = items.description;
 				$scope.taskType = items.taskType;
 				$scope.name = items.name;
+				if(items.shortDesc && (items.shortDesc !== '' || items.shortDesc !== null)){
+					$scope.checkBotStatus = true;
+					$scope.checkBotType = true;
+				}
+				$scope.botType = items.botType;
+				$scope.shortDesc = items.shortDesc;
 				//properties specific to jenkins
 				if (items.taskType === "jenkins") {
 					$scope.jobUrl = items.taskConfig.jobURL;
diff --git a/client/cat3/src/partials/sections/dashboard/workzone/workzone.scss b/client/cat3/src/partials/sections/dashboard/workzone/workzone.scss
index d09ea5c12..31191d43b 100644
--- a/client/cat3/src/partials/sections/dashboard/workzone/workzone.scss
+++ b/client/cat3/src/partials/sections/dashboard/workzone/workzone.scss
@@ -59,7 +59,6 @@
         .panelRight {
             padding-left: 10px;
             padding-right: 0px;
-            float: right;
         }
     }
 }
@@ -75,10 +74,9 @@
         padding-left: 0px;
     }
     .panelRight {
-        width: calc(100% - 258px);
+        width: 100%;
         background: linear-gradient(to right, #ffffff 99%, #ffffff 100%) repeat scroll 0 0 rgba(0, 0, 0, 0);
         padding-right: 0px;
-        float: right;
     }
     #rightPanel {
         padding-top: 5px;
diff --git a/client/cat3/src/partials/sections/dashboard/workzone/workzoneCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/workzoneCtrl.js
index ea3d09b80..6764c38e7 100644
--- a/client/cat3/src/partials/sections/dashboard/workzone/workzoneCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/workzone/workzoneCtrl.js
@@ -91,7 +91,6 @@ angular.module('dashboard.workzone', ['angularTreeview', 'mgcrea.ngStrap', 'work
 		'use strict';
 		//For showing menu icon in menu over breadcrumb without position flickering during load
 		$scope.isLoading = true;
-		$scope.showTree = true;
 		function getParams(str) {
 			var l = str.split('&');
 			var list = [];
@@ -105,22 +104,6 @@ angular.module('dashboard.workzone', ['angularTreeview', 'mgcrea.ngStrap', 'work
 				env: list[3]
 			};
 		}
-		$scope.hideTreeOverlay = function () {
-			$scope.showTree = false;
-			$(".panelRight").css("width", "calc(100% - 39px)");
-			$("#navigPage").addClass("tree-close");
-			$(".minifyme").css("left", "0px");
-			$(".minifyme").css("border-radius", "0px");
-			$(".minifyme").css("width", "35px");
-		};
-		$scope.showTreeOverlay = function () {
-			$scope.showTree = true;
-			$(".panelRight").css("width", "calc(100% - 258px)");
-			$("#navigPage").removeClass("tree-close");
-			$(".minifyme").css("left", "216px");
-			$(".minifyme").css("width", "38px");
-			$(".minifyme").css("border-radius", "5px 0 0 5px");
-		};
 		//this function is applicable only if enviornments are only selectable items.
 		function getNames(node) {
 			return {
@@ -163,7 +146,6 @@ angular.module('dashboard.workzone', ['angularTreeview', 'mgcrea.ngStrap', 'work
 				$rootScope.$emit('WZ_ENV_CHANGE_START', requestParams, requestParamNames);
 				var treeNames = ['Workzone', requestParamNames.org, requestParamNames.bg, requestParamNames.proj, requestParamNames.env];
 				$rootScope.$emit('treeNameUpdate', treeNames);
-				$scope.showTreeOverlay();
 			}
 		};
 		$scope.relevancelab.selectNodeHeadCallback = function (node) {
diff --git a/client/cat3/src/partials/sections/dashboard/workzone/workzoneTreeMenu/workzoneTreeMenu.html b/client/cat3/src/partials/sections/dashboard/workzone/workzoneTreeMenu/workzoneTreeMenu.html
index 261bc5b8a..071ecf9eb 100644
--- a/client/cat3/src/partials/sections/dashboard/workzone/workzoneTreeMenu/workzoneTreeMenu.html
+++ b/client/cat3/src/partials/sections/dashboard/workzone/workzoneTreeMenu/workzoneTreeMenu.html
@@ -2,12 +2,8 @@
 <link rel="stylesheet" type="text/css" href="catalyst/partials/globals/treeComponent/treeDirective.css"/>
 
 <div id='workzoneTreeMenuPage' ng-controller="workzoneTreeCtrl">
-	<span ng-show="!isLoading" class="tree-wrapper">
-		<span ng-click="showTreeOverlay()" class="minifyme cursor"> <i class="fa fa-arrow-circle-right black hit"></i> </span>
-		<span ng-click="hideTreeOverlay()" class="minifyme cursor" title="Hide Tree" ng-show="showTree"> <i class="fa fa-arrow-circle-left black hit"></i> </span>
-	</span>
-	<div id='navigPage'>
-		<div id='navigPage-inner' ng-show="showTree">
+	<div id='navigPage' ng-mouseover="showTreeOverlay()" ng-mouseleave="hideTreeOverlay()" ng-class="{'show-left-tree':showTree}">
+		<div id='navigPage-inner'>
 			<div id="treeParent"
 				data-angular-treeview="true"
 				data-tree-model="roleList"
@@ -20,7 +16,7 @@
 </div>
 
 <script>
-	$(document).ready(function() {
+	$(document).ready(function() { 
 		function setHeight() {
 			var windowHeight = $(window).innerHeight();
 			var brdcrmbHeight = $('#breadcrumb-block').outerHeight();
diff --git a/client/cat3/src/partials/sections/dashboard/workzone/workzoneTreeMenu/workzoneTreeMenu.scss b/client/cat3/src/partials/sections/dashboard/workzone/workzoneTreeMenu/workzoneTreeMenu.scss
deleted file mode 100644
index 2058907aa..000000000
--- a/client/cat3/src/partials/sections/dashboard/workzone/workzoneTreeMenu/workzoneTreeMenu.scss
+++ /dev/null
@@ -1,105 +0,0 @@
-#navigPage {
-	background: linear-gradient(to right, #2c3638 99%, #2c3638 100%);
-	z-index: 1;
-	position: fixed;
-	width: 254px;
-	z-index: 3;
-
-	#navigPage-inner {
-		background: linear-gradient(to right, #2c3638 99%, #2c3638 100%);
-		color: #fff;
-		z-index: 1;
-		width: 100%;
-		overflow-y: auto;
-	}
-
-	div[data-angular-treeview] {
-		color: #fff;
-		font-size: 12px;
-		font-family: "Open Sans", Arial, Helvetica, Sans-Serif;
-	}
-
-	div[data-tree-model] li .selected {
-		padding: 0px;
-	}
-
-	div[data-tree-model] li span:hover {
-		text-decoration: underline;
-	}
-
-	div[data-tree-model] li {
-		line-height: 2.2;
-		padding: 0;
-	}
-		
-	div[data-tree-model] ul {
-		margin-left:-10px;
-		ul {
-			margin-left:-20px;
-			ul {
-				margin-left:-30px;
-				ul {
-					margin-left:-40px;
-				}
-			}
-		}
-	}
-
-	div[data-tree-model] .liContents {
-		margin-left: 20px;
-		.liContents  {
-			margin-left: 30px;
-			.liContents {
-				margin-left: 40px;
-				.liContents {
-					margin-left: 50px;
-				}
-			}
-		}
-	}
-
-	div[data-tree-model] li.selected{
-		background:#3b4142;
-	}
-
-	.collapse-spacing {
-		padding-right: 10px;
-	}
-
-	.label-spacing {
-		padding-right: 5px;
-	}
-
-	.caret-spacing {
-		margin-top: 8px;
-	}
-
-	i {
-		color:#fff;
-	}
-}
-
-.tree-close {
-	width: 35px !important;
-}
-
-.minifyme {
-	background: #D7DAE2;
-    border-bottom: 1px solid #818181;
-    color: #7E7E7E;
-    z-index: 100;
-    text-align: center;
-    padding: 0;
-    width: 38px;
-    height: 28px;
-    display: block;
-    position: absolute;
-    right: 0px;
-    border-radius: 5px 0 0 5px;
-    cursor: pointer;
-    font-size: 19px;
-    -webkit-transition: all .1s linear 0s;
-    transition: all .1s linear 0s;
-    left: 216px;
-}
-
diff --git a/client/htmls/private/ajax/Settings/Dashboard.html b/client/htmls/private/ajax/Settings/Dashboard.html
index 2f95820ed..0516eb5b4 100755
--- a/client/htmls/private/ajax/Settings/Dashboard.html
+++ b/client/htmls/private/ajax/Settings/Dashboard.html
@@ -34,22 +34,22 @@ <h5 class="widget-title" style="color:#4e5964;">
                <a type="button" href="ajax/Settings/configManagementWizard.html" class="btn wizardbtn-circle process-btn">2</a><br />
                <p class="wizardLabelName">Config Management</p>
             </div>
+            <div class="btn-1" id="userConfiguration">
+               <a type="button" href="ajax/Settings/userManagementWizard.html" class="btn wizardbtn-circle process-btn">3</a><br />
+               <p class="wizardLabelName">User Configuration</p>
+            </div>
             <div class="btn-1" id="providerConfiguration">
-               <a type="button" href="ajax/Settings/providerWizard.html" class="btn wizardbtn-circle process-btn">3</a><br />
+               <a type="button" href="ajax/Settings/providerWizard.html" class="btn wizardbtn-circle process-btn">4</a><br />
                <p class="wizardLabelName">Provider Configuration</p>
             </div>
             <div class="btn-1" id="galleryConfiguration">
-               <a type="button" href="ajax/Settings/galleryWizard.html" class="btn wizardbtn-circle process-btn">4</a><br />
+               <a type="button" href="ajax/Settings/galleryWizard.html" class="btn wizardbtn-circle process-btn">5</a><br />
                <p class="wizardLabelName">Gallery Setup</p>
             </div>
             <div class="btn-1" id="devopsConfiguration">
-               <a type="button" href="ajax/Settings/devopsRolesWizard.html" class="btn wizardbtn-circle process-btn">5</a><br />
+               <a type="button" href="ajax/Settings/devopsRolesWizard.html" class="btn wizardbtn-circle process-btn">6</a><br />
                <p class="wizardLabelName">Devops Roles</p>
             </div>
-            <div class="btn-1" id="cmdbConfiguration">
-               <a type="button" href="ajax/Settings/cmdbWizard.html" class="btn wizardbtn-circle process-btn">6</a><br />
-               <p class="wizardLabelName">CMDB Configuration</p>
-            </div>
          </div>
       </div>
    </div>
@@ -102,9 +102,11 @@ <h5 class="widget-title" style="color:#4e5964;">
 $('.btn-1 a').click(function(e) {
     e.preventDefault();
     if($(this).attr('href')){
+        clicked = true;
         $('.wizardFlow').empty();    
         $(this).addClass('wizardActiveBtn').attr('href');
         $(this).removeClass('process-btn');
+         //$(this).removeClass('green-btn').removeClass('active');
         $('.contentSetting').load(this.getAttribute('href'));
     }
 });
@@ -161,41 +163,55 @@ <h5 class="widget-title" style="color:#4e5964;">
 selectedDropdownValue = $('#orgDropdown option:selected').val();
 orgForBg = $('#orgDropdown option:selected').text();
 $('#orgConfiguration a').click(function(e) {
+   //  $(this).removeClass('green-btn').removeClass('active');
+    $('#wizardActionListLoader').show();
     selectedDropdownValue = $('#orgDropdown option:selected').val();
     orgForBg = $('#orgDropdown option:selected').text();
     if (selectedDropdownValue) {
-        getOrgValues();
+        $('#wizardActionListLoader').hide();
     } else {
         $('.wizardFlow').empty();
         lastDropdownValue = $('#orgDropdown option:last').val();
+        $('#wizardActionListLoader').hide();
     }
 });
 
 $('#configManagement a').click(function(e) {
+   // $(this).removeClass('green-btn').removeClass('active');
+    
     selectedDropdownValue = $('#orgDropdown option:selected').val();
     orgForBg = $('#orgDropdown option:selected').text();
 });
 
 $('#providerConfiguration a').click(function(e) {
+  //  $(this).removeClass('green-btn').removeClass('active');
+    
     selectedDropdownValue = $('#orgDropdown option:selected').val();
     orgForBg = $('#orgDropdown option:selected').text();
 });
 
-$('#galleryConfiguration a').click(function(e) {
+$('#userConfiguration a').click(function(e) {
+//    $(this).removeClass('green-btn').removeClass('active');
+    
     selectedDropdownValue = $('#orgDropdown option:selected').val();
     orgForBg = $('#orgDropdown option:selected').text();
 });
 
-$('#devopsConfiguration a').click(function(e) {
+$('#galleryConfiguration a').click(function(e) {
+ //   $(this).removeClass('green-btn').removeClass('active');
+    $('#startConfig a,#orgConfiguration a,#providerConfiguration a, #configManagement a,#userConfiguration a,#devopsConfiguration a').removeClass('active').addClass('green-btn');
     selectedDropdownValue = $('#orgDropdown option:selected').val();
     orgForBg = $('#orgDropdown option:selected').text();
 });
 
-$('#cmdbConfiguration a').click(function(e) {
+$('#devopsConfiguration a').click(function(e) {
+   // $(this).removeClass('green-btn').removeClass('active');
+    $('#startConfig a,#orgConfiguration a,#providerConfiguration a, #configManagement a,#userConfiguration a,#galleryConfiguration a').removeClass('active').addClass('green-btn');
     selectedDropdownValue = $('#orgDropdown option:selected').val();
     orgForBg = $('#orgDropdown option:selected').text();
 });
 
+
 function changeWizardStatus(orgIdForSetup) {
     $('#wizardActionListLoader').show();
     $.get('/setting-wizard/org/' + orgIdForSetup, function(data) {
@@ -210,33 +226,37 @@ <h5 class="widget-title" style="color:#4e5964;">
                     $('#orgConfiguration a').trigger('click');
                     $('#startConfig a').addClass('green-btn').removeClass('process-btn');
                     $('#orgConfiguration a').addClass('wizardActiveBtn').removeClass('process-btn');
-                    $('#configManagement a,#providerConfiguration a,#galleryConfiguration a,#devopsConfiguration a,#cmdbConfiguration a').removeAttr('href');
+                    $('#configManagement a,#providerConfiguration a,#galleryConfiguration a,#devopsConfiguration a,#cmdbConfiguration a,#userConfiguration a').removeAttr('href');
                 } else if (data.previousStep.name === 'Org Configuration') {
                     $('#configManagement a').attr('href','ajax/Settings/configManagementWizard.html');
                     $('#configManagement a').trigger('click');
                     $('.providerSelect').removeClass('hidden');
                     $('#startConfig a, #orgConfiguration a').addClass('green-btn').removeClass('process-btn');
-                    $('#providerConfiguration a,#galleryConfiguration a,#devopsConfiguration a,#cmdbConfiguration a').removeAttr('href');
-                    toastr.error('Please Configure Teams to Navigate to Workzone');
+                    $('#providerConfiguration a,#galleryConfiguration a,#devopsConfiguration a,#cmdbConfiguration a,#userConfiguration a').removeAttr('href');
                 } else if (data.previousStep.name === 'Config Management') {
+                    $('#userConfiguration a').attr('href','ajax/Settings/userManagementWizard.html');
+                    $('#userConfiguration a').trigger('click');
+                    $('#providerConfiguration a,#galleryConfiguration a,#devopsConfiguration a,#cmdbConfiguration a').removeAttr('href');
+                    $('#startConfig a,#orgConfiguration a,#configManagement a').removeClass('wizardActiveBtn process-btn').addClass('green-btn');
+                } else if (data.previousStep.name === 'User Configuration') {
                     $('#providerConfiguration a').attr('href','ajax/Settings/providerWizard.html');
                     $('#providerConfiguration a').trigger('click');
                     $('#galleryConfiguration a,#devopsConfiguration a,#cmdbConfiguration a').removeAttr('href');
-                    $('#startConfig a,#orgConfiguration a,#configManagement a').removeClass('wizardActiveBtn process-btn').addClass('green-btn');
+                    $('#startConfig a,#orgConfiguration a,#configManagement a,#userConfiguration a').removeClass('wizardActiveBtn process-btn').addClass('green-btn');
                 } else if (data.previousStep.name === 'Provider Configuration') {
                     $('#galleryConfiguration a').attr('href','ajax/Settings/galleryWizard.html');
                     $('#galleryConfiguration a').trigger('click');
                     $('#devopsConfiguration a,#cmdbConfiguration a').removeAttr('href');
-                    $('#startConfig a, #orgConfiguration a,#configManagement a,#providerConfiguration a').removeClass('wizardActiveBtn process-btn').addClass('green-btn');
+                    $('#startConfig a, #orgConfiguration a,#configManagement a,#userConfiguration a,#providerConfiguration a').removeClass('wizardActiveBtn process-btn').addClass('green-btn');
                 } else if (data.previousStep.name === 'Gallery Setup') {
                     $('#devopsConfiguration a').attr('href','ajax/Settings/devopsRolesWizard.html');
                     $('#devopsConfiguration a').trigger('click');
-                    $('#startConfig a, #orgConfiguration a,#configManagement a,#providerConfiguration a,#galleryConfiguration a').removeClass('wizardActiveBtn process-btn').addClass('green-btn');
+                    $('#startConfig a, #orgConfiguration a,#configManagement a,#userConfiguration a,#providerConfiguration a,#galleryConfiguration a').removeClass('wizardActiveBtn process-btn').addClass('green-btn');
                     $('#cmdbConfiguration a').removeAttr('href');
                 } else if (data.previousStep.name === 'Devops Roles') {
-                    $('#cmdbConfiguration a').attr('href','ajax/Settings/cmdbWizard.html');
-                    $('#cmdbConfiguration a').trigger('click');
-                    $('#startConfig a, #orgConfiguration a,#configManagement a, #providerConfiguration a,#galleryConfiguration a,#devopsConfiguration a').removeClass('wizardActiveBtn process-btn').addClass('green-btn');
+                    $('#startConfig a, #orgConfiguration a,#configManagement a,#userConfiguration a, #providerConfiguration a,#galleryConfiguration a,#devopsConfiguration a').removeClass('wizardActiveBtn process-btn').addClass('green-btn');
+                    $('#devopsConfiguration a').attr('href','ajax/Settings/devopsRolesWizard.html');
+                    $('#devopsConfiguration a').trigger('click');
                 }
             }
         }
diff --git a/client/htmls/private/ajax/Settings/configManagementWizard.html b/client/htmls/private/ajax/Settings/configManagementWizard.html
index f2ddd8772..b002f1395 100644
--- a/client/htmls/private/ajax/Settings/configManagementWizard.html
+++ b/client/htmls/private/ajax/Settings/configManagementWizard.html
@@ -93,10 +93,7 @@ <h4 class="widget-margin" style="color:black;">New Configuration Management</h4>
 <input type="hidden" id="configWizardValueNewEdit"/>
 <script>
  //jQuery time
- orgNameForSetup = $('#orgDropdown option:selected').attr('rowid');
- orgIdForSetup = $('#orgDropdown option:selected').val();
- var $option = $('<option></option>').val(orgNameForSetup).attr('rowid', orgIdForSetup).html(orgNameForSetup);
- $('#orgname').append($option);
+
  function bindChange_importPemFile() {
      $('input[type="file"]').off('change').on('change', function() {
          $(this).next().val(this.files[0].name);
@@ -104,10 +101,61 @@ <h4 class="widget-margin" style="color:black;">New Configuration Management</h4>
      });
  }
  
-     //api call for getting the status of wizard
-     var wizardStepsConfig = $('<ol id="configWizard" class="bwizard-steps clearfix clickable"><li aria-selected="true" id="chefCreate" class="active btn-2 chefCreate" style="z-index: 4;"><span class="label badge-inverse">1</span><a href="ajax/Settings/configManagementWizard.html" class="hidden-phone">Create Chef Server</a></li><li aria-selected="false" style="z-index: 3;" id="envCreate" class="btn-3 envCreate"><span class="label">2</span><a href="ajax/Settings/envWizard.html" class="not-activeAnchor hidden-phone">Create Environment</a></li><li aria-selected="false" style="z-index: 3;" id="teamCreate" class="btn-4 teamCreate"><span class="label">3</span><a href="ajax/Settings/teamWizard.html" class="not-activeAnchor hidden-phone">Create Team</a></li></ol>');
+     
+     $(document).ready(function(e){
+         orgNameForSetup = $('#orgDropdown option:selected').attr('rowid');
+ orgIdForSetup = $('#orgDropdown option:selected').val();
+ var $option = $('<option></option>').val(orgNameForSetup).attr('rowid', orgIdForSetup).html(orgNameForSetup);
+ $('#orgname').append($option);
+        //api call for getting the status of wizard
+     var wizardStepsConfig = $('<ol id="configWizard" class="bwizard-steps bwizard-stepsConfig clearfix clickable"><li aria-selected="true" id="chefCreate" class="active btn-2 chefCreate" style="z-index: 4;"><span class="label badge-inverse">1</span><a href="ajax/Settings/configManagementWizard.html" class="hidden-phone">Chef Server</a></li><li aria-selected="false" style="z-index: 3;" id="envCreate" class="btn-3 envCreate"><span class="label">2</span><a href="ajax/Settings/envWizard.html" class="not-activeAnchor hidden-phone">Environment</a></li></ol>');
      $('.wizardFlow').append(wizardStepsConfig);
-     $('.btn-2 a').addClass('not-activeAnchor');
+            function configWizardStatus(orgIdForSetup) {
+            $.get('/setting-wizard/org/' + orgIdForSetup, function(data) {
+             if (data.currentStep.name === 'Config Management') {
+                 if (data.currentStep.nestedSteps) {
+                     var nestedSteps = data.currentStep.nestedSteps;
+                     if (nestedSteps[0].name === 'ChefServer' && nestedSteps[0].isCompleted === true && nestedSteps[1].name === 'Environment' && nestedSteps[1].isCompleted === false) {
+                         $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
+                         $('.contentSetting').find('ol li#envCreate').addClass('active');
+                         $('.content').load('ajax/Settings/envWizard.html');
+                         toastr.error('Please configure your Environment');
+                     } else {
+                         toastr.error('Please configure your Chef Server & Environments');
+                     }
+                 }
+             } else {
+                 getConfigValues();
+                 $('#saveConfigWizard').addClass('hidden');
+                 $('.nextFormWizard').removeAttr('disabled');
+                 $('.btn-3 a').removeClass('not-activeAnchor');
+                // $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
+                 $('.btn-3 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
+             }
+         });
+        $('#wizardActionListLoader').hide();
+     }
+     
+     var configWizardEditValue;
+     orgIdForSetup = selectedDropdownValue || firstOrgValue;
+     if (clicked) {
+        if(orgIdForSetup){
+            configWizardStatus(orgIdForSetup);
+        }
+     } else {
+        //comes when the chefServer is created and navigates back to it.
+        if(orgIdForSetup){
+            $('#wizardActionListLoader').hide();
+            getConfigValues();
+            $('.btn-3 a').removeClass('not-activeAnchor');
+            $('.nextFormWizard').removeAttr('disabled');
+          } 
+     }
+     getTemplate = function(val, rowid) {
+           return '<label class="toggle font-sm" style="padding-left:4px;"><input onclick="if($(this).is(&quot;:checked&quot;)) {$(this).closest(&quot;label&quot;).' + 'css(&quot;background-color&quot;,&quot;#eeeeee&quot;);$(this).css(&quot;border-color&quot;,&quot;#3b9ff3&quot;);}else{$(this).closest(&quot;label&quot;).css(&quot;background-color&quot;,&quot;#ffffff&quot;);$(this).css(&quot;border-' + 'color&quot;,&quot;red&quot;);}" type="checkbox" id="checkbox-toggle" name="checkbox-toggle"' +'value="'+ val +'"' + 'rowid="' + rowid + '" style="width:100%"><i data-swchoff-text="NO" data-swchon-text="YES"></i>' + val + '</label>';
+       };
+     });
+     
      function getConfigValues() {
          $.get('/d4dMasters/readmasterjsonnew/10', function(data) {
              for (var i = 0; i < data.length; i++) {
@@ -124,7 +172,7 @@ <h4 class="widget-margin" style="color:black;">New Configuration Management</h4>
                      $('input#kniferbfile').attr('disabled','disabled');
                      var $knifeFileLocation = $('#knifeFile');
                      $knifeFileLocation.find('input.knifeFile').attr('disabled','disabled').val(data[i].kniferbfile_filename);
-                     $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
+                    // $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
                      $('#saveConfigWizard').addClass('hidden');
                      $('.nextFormWizard').removeAttr('disabled');
                  }
@@ -142,6 +190,7 @@ <h4 class="widget-margin" style="color:black;">New Configuration Management</h4>
                      $('#myForm1').find('select#configname').append($optionConfigNameEnv).attr('disabled', 'disabled');
                      $('#myForm1').find('select#environmentname').remove();
                      $('#myForm1').find('input#environmentName').removeClass('hidden').val(data[i].environmentname).attr('disabled','disabled');
+                     $('#myForm1 #projectname').find('input[type="checkbox"][value="'+data[i].projectname+'"]').prop('checked',true);
                      $('.btn-3 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
                      $('#myForm1').find('button#saveConfigEnv').addClass('hidden');
                      $('.nextFormWizard').removeAttr('disabled');
@@ -150,104 +199,25 @@ <h4 class="widget-margin" style="color:black;">New Configuration Management</h4>
          });
      }
 
-     function getTeamValues() {
-         $.get('/d4dMasters/readmasterjsonnew/21', function(data) {
-             for (var i = 0; i < data.length; i++) {
-                 if (selectedDropdownValue === data[i].orgname_rowid[0]) {
-                    var $optionOrgNameEnv = $('<option></option>').val(data[i].orgname[0]).attr('rowid', data[i].orgname_rowid[0]).html(data[i].orgname[0]);
-                    $('#myForm3').find('select#orgname').append($optionOrgNameEnv).attr('disabled', 'disabled');
-                    $('#myForm3').find('input#teamname').val(data[i].teamname).attr('disabled', 'disabled');
-                     $('#myForm3').find('input#description').val(data[i].description).attr('disabled', 'disabled');
-                     $('.btn-4 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
-                     $('#myForm3').find('button#saveConfigTeam').addClass('hidden');
-                     $('.nextFormWizard').removeAttr('disabled');
-                 }
-             }
-         });
-     }
 
      $('.btn-2 a').click(function(e) {
          e.preventDefault();
          clicked = false;
          $('.btn-3 a').removeClass('not-activeAnchor');
-         $('.btn-4 a').removeClass('not-activeAnchor');
          $('.contentSetting').load(this.getAttribute('href'));
      });
      $('.envCreate a').click(function(e) {
          e.preventDefault();
          $('.content').empty();
          $('.btn-2 a').removeClass('not-activeAnchor');
-         getEnvValues();
-         $('.btn-2 a').parent('.bwizard-steps li').removeClass('active');
-         $(this).parent('.bwizard-steps li').addClass('active');
-         $('.content').load(this.getAttribute('href'));
-     });
-     
-     $('.btn-4 a').click(function(e) {
-         e.preventDefault();
-         $('.content').empty();
-         $('.btn-2 a').removeClass('not-activeAnchor');
-         getTeamValues();
-         $('.btn-2 a').parent('.bwizard-steps li').removeClass('active');
+         $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
          $(this).parent('.bwizard-steps li').addClass('active');
          $('.content').load(this.getAttribute('href'));
+         getEnvValues();
      });
 
-     function configWizardStatus(orgIdForSetup) {
-            $.get('/setting-wizard/org/' + orgIdForSetup, function(data) {
-             if (data.currentStep.name === 'Config Management') {
-                 if (data.currentStep.nestedSteps) {
-                     var nestedSteps = data.currentStep.nestedSteps;
-                     if (nestedSteps[0].name === 'ChefServer' && nestedSteps[0].isCompleted === true && nestedSteps[1].name === 'Environment' && nestedSteps[1].isCompleted === false && nestedSteps[2].name === 'Teams' && nestedSteps[2].isCompleted === false) {
-                         $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
-                         $('.contentSetting').find('ol li#envCreate').addClass('active');
-                         $('.content').load('ajax/Settings/envWizard.html');
-                     } else if (nestedSteps[0].name === 'ChefServer' && nestedSteps[0].isCompleted === true && nestedSteps[1].name === 'Environment' && nestedSteps[1].isCompleted === true && nestedSteps[2].name === 'Teams' && nestedSteps[2].isCompleted === false) {
-                        $('.btn-2 a,.btn-3 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
-                         $('.contentSetting').find('ol li#teamCreate').addClass('active');
-                         $('.btn-3 a').removeClass('not-activeAnchor');
-                         $('.content').load('ajax/Settings/teamWizard.html');
-                     } else {
 
-                     }
-                 }
-             } else {
-                 getConfigValues();
-                 getEnvValues();
-                 getTeamValues();
-                 $('#saveConfigWizard').addClass('hidden');
-                 $('.nextFormWizard').removeAttr('disabled');
-                 $('.btn-3 a').removeClass('not-activeAnchor');
-                 $('.btn-4 a').removeClass('not-activeAnchor');
-                 $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
-                 $('.btn-3 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
-                 $('.btn-4 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
-             }
-         });
-        $('#wizardActionListLoader').hide();
-     }
-     var configWizardStatusValue = $('#configWizardValueNewEdit').val('new');
-     var configWizardEditValue;
-     orgIdForSetup = selectedDropdownValue || firstOrgValue;
-     if (clicked) {
-        if(orgIdForSetup){
-            if(configWizardStatusValue){
-                configWizardStatus(orgIdForSetup);
-            }
-        }
-     } else {
-        //comes when the chefServer is created and navigates back to it.
-        if(orgIdForSetup){
-            configWizardEditValue = $('#configWizardValueNewEdit').val('edit');
-            if(configWizardEditValue){
-                $('#wizardActionListLoader').hide();
-                getConfigValues();
-                $('.btn-3 a').removeClass('not-activeAnchor');
-                $('.btn-4 a').removeClass('not-activeAnchor');
-                $('.nextFormWizard').removeAttr('disabled');
-            } 
-          } 
-     }
+     
 
 
 
diff --git a/client/htmls/private/ajax/Settings/devopsRolesWizard.html b/client/htmls/private/ajax/Settings/devopsRolesWizard.html
index bbfae17b8..94347f87e 100644
--- a/client/htmls/private/ajax/Settings/devopsRolesWizard.html
+++ b/client/htmls/private/ajax/Settings/devopsRolesWizard.html
@@ -92,7 +92,7 @@ <h4 class="widget-margin" style="color:black;">Nexus Configuration Management</h
          </div>
          <div class="widget-toolbox clearfix">
             <div class="btn-group pull-right">
-               <button name="next1" id="saveProviderWizard" style="margin-right:11px;" class="saveFormWizard btn btn-primary"><i class="ace-icon fa fa-check bigger-110"></i>&nbsp;Save</i></button>
+               <button name="next1" id="saveNexusWizard" style="margin-right:11px;" class="saveFormWizard btn btn-primary"><i class="ace-icon fa fa-check bigger-110"></i>&nbsp;Save</i></button>
                <input type="button" name="next1" id="next1" class="nextFormWizard btn btn-primary" value="Next"/>
             </div>
          </div>
@@ -171,19 +171,156 @@ <h4 class="modal-title">
    </div>
 </div>
 <script>
-    orgNameForSetup = $('#orgDropdown option:selected').attr('rowid');
+   $(document).ready(function(e) {
+      var devopsRolesWizard = $('<ol class="bwizard-steps bwizard-steps3 clearfix clickable"><li aria-selected="true" class="btn-2 nexusCreate active" id="nexusCreate" style="z-index: 4;"><span class="label badge-inverse">1</span><a href="ajax/Settings/devopsRolesWizard.html" class="hidden-phone">Nexus Configuration</a></li><li aria-selected="true" style="z-index: 3;" id="dockerCreate" class="btn-3 dockerCreate"><span class="label">2</span><a href="ajax/Settings/dockerWizard.html" class="hidden-phone">Docker Configuration</a></li><li aria-selected="true" style="z-index: 2;" id="jenkinsCreate" class="btn-4 jenkinsCreate"><span class="label btn-1">3</span><a href="ajax/Settings/jenkinsWizard.html" class="hidden-phone">Jenkins Configuration</a></li></ol>');
+    $('.wizardFlow').append(devopsRolesWizard);
+     orgNameForSetup = $('#orgDropdown option:selected').attr('rowid');
     orgIdForSetup = $('#orgDropdown option:selected').val();
     var $option = $('<option></option>').val(orgNameForSetup).attr('rowid', orgIdForSetup).html(orgNameForSetup);
     $('#orgname').append($option);
+        //api call for getting the status of wizard
+        if(clicked){
+          $('#wizardActionListLoader').show();
+            $.get('/setting-wizard/org/' + orgIdForSetup, function(data) {
+              if (data.currentStep.name === 'Devops Roles') {
+                if (data.currentStep.nestedSteps) {
+                    var nestedSteps = data.currentStep.nestedSteps;
+                    if (nestedSteps[0].name === 'Nexus' && nestedSteps[0].isCompleted === true &&
+                        nestedSteps[1].name === 'Docker' && nestedSteps[1].isCompleted === false &&
+                        nestedSteps[2].name === 'Jenkins' && nestedSteps[2].isCompleted === false) {
+                        $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
+                        $('.contentSetting').find('ol li#dockerCreate').addClass('active');
+                        $('.content').load('ajax/Settings/dockerWizard.html');
+                    } else if (nestedSteps[0].name === 'Nexus' && nestedSteps[0].isCompleted === true &&
+                        nestedSteps[1].name === 'Docker' && nestedSteps[1].isCompleted === true &&
+                        nestedSteps[2].name === 'Jenkins' && nestedSteps[2].isCompleted === false) {
+                        $('.btn-2 a,.btn-3 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
+                        $('.contentSetting').find('ol li#dockerCreate').removeClass('active').addClass('green-btn');
+                        $('.contentSetting').find('ol li#jenkinsCreate').addClass('active');
+                        $('.content').load('ajax/Settings/jenkinsWizard.html');
+                    } else {
+
+                    }
+                }
+              } else {
+                getNexusRepoDetailsOnEdit();
+                $('.btn-3 a,.btn-4 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
+              }
+            });
+            $('#wizardActionListLoader').hide();
+        } else {
+            getNexusRepoDetailsOnEdit();
+        }
+    });
+  
+    function getNexusRepoDetailsOnEdit() {
+      $.get('/d4dMasters/readmasterjsonnew/26', function(data){
+          for (var i = 0; i < data.length; i++) {
+             if (selectedDropdownValue === data[i].orgname_rowid[0]) {
+                 var $optionOrgNameEnv = $('<option></option>').val(data[i].orgname[0]).attr('rowid', data[i].orgname_rowid[0]).html(data[i].orgname[0]);
+                 $('#myForm101').find('select#orgname').append($optionOrgNameEnv).attr('disabled', 'disabled');
+                 $('#myForm101').find('input#nexusservername').val(data[i].nexusservername).attr('disabled', 'disabled');
+                 $('#myForm101').find('input#username').val(data[i].username).attr('disabled', 'disabled');
+                 $('#myForm101').find('input#nexuspassword').val(data[i].nexuspassword).attr('disabled', 'disabled').removeAttr('type').attr('type','password');
+                 $('#myForm101').find('input#hostname').val(data[i].hostname).attr('disabled', 'disabled');
+                 $('#myForm101 #projectname').find('input[type="checkbox"][value="'+data[i].projectname+'"]').attr('checked','checked')
+                 //$('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
+                 $('#myForm101').find('button#saveNexusWizard').addClass('hidden');
+                 for (var j = 0; j < data[i].groupid.length; j++) {
+                     (function(j) {
+                       var nexusGroupName = data[i].groupid[j];
+                       var $nexusGroupTbody = $('#nexusGroupTbody');
+                       var $tr = $('<tr class="nexusGroupDetailsRow"></tr>');
+                       var $tdnexusGroupName = $('<td class="tdnexusGroupName" value=' + nexusGroupName + ' style="word-break: break-word;"></td>');
+                       $tr.data('nexusGroupName', nexusGroupName);
+
+                       $tdnexusGroupName.append(nexusGroupName);
+                       var $tdAction = $('<td/>');
+                       $tdAction.append('<div class="btn-group"><button class="deleteRow" value="Remove" title="Remove"><i class="ace-icon fa fa-trash-o bigger-120"></i></button></div>');
+
+                       $tdAction.find('.deleteRow').click(function() {
+                         $nexusGroupDetails.row($tr).remove().draw(true);
+                       });
+
+                       $tr.append($tdnexusGroupName).append($tdAction);
+                       $nexusGroupTbody.append($tr);
+                       $nexusGroupDetails.row.add($tr).draw();
+                     })(j);
+                }
+                for(var k =0; k < data[i].repositories.nexus.length; k++) {
+                  
+                      var nexusRepoName = data[i].repositories.nexus[k];
+                       var $repoDeployTbody = $('#repoDeployTbody');
+            var $tr = $('<tr class="repoDetailsRow"></tr>');
+            var $tdName = $('<td class="tdrepoName" value=' + nexusRepoName + ' style="word-break: break-word;"></td>');
+            $tr.data('repoName', nexusRepoName);
+
+            $tdName.append(nexusRepoName);
+            var $tdAction = $('<td/>');
+            $tdAction.append('<div style="margin-right:17px;float:right;" class="btn-group"><button class="deleteRow" value="Remove" title="Remove"><i class="ace-icon fa fa-trash-o bigger-120"></i></button></div>');
+
+            $tdAction.find('.deleteRow').click(function() {
+                $repoDetails.row($tr).remove().draw(true);
+            });
+
+            $tr.append($tdName).append($tdAction);
+            $repoDeployTbody.append($tr);
+            $repoDetails.row.add($tr).draw();
+                  
+                }
+             }
+         }
+      });
+    }
+
+    function getDockerDetailsOnEdit() {
+      $.get('/d4dMasters/readmasterjsonnew/18',function(data){
+          for (var i = 0; i < data.length; i++) {
+             if (selectedDropdownValue === data[i].orgname_rowid[0]) {
+                 var $optionOrgNameDocker = $('<option></option>').val(data[i].orgname[0]).attr('rowid', data[i].orgname_rowid[0]).html(data[i].orgname[0]);
+                 $('#myForm45').find('select#orgname').append($optionOrgNameDocker).attr('disabled', 'disabled');
+                 $('#myForm45').find('input#dockerreponame').val(data[i].dockerreponame).attr('disabled', 'disabled');
+                 $('#myForm45').find('input#dockerrepopath').val(data[i].dockerrepopath).attr('disabled', 'disabled');
+                 $('#myForm45').find('input#dockeruserid').val(data[i].dockeruserid).attr('disabled', 'disabled');
+                 $('#myForm45').find('input#dockerpassword').val(data[i].dockerpassword).attr('disabled', 'disabled').removeAttr('type').attr('type','password');
+                 $('#myForm45').find('input#dockeremailid').val(data[i].dockeremailid).attr('disabled', 'disabled');
+                 $('#myForm45 #projectname').find('input[type="checkbox"][value="'+data[i].projectname+'"]').attr('checked',true);
+                 $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
+                 $('#myForm45').find('button#saveDockerWizard').addClass('hidden');
+                 
+             }
+         }
+      });
+    }
+
+    function getJenkinsOnEdit() {
+        $.get('/d4dMasters/readmasterjsonnew/20',function(data){
+          for (var i = 0; i < data.length; i++) {
+             if (selectedDropdownValue === data[i].orgname_rowid[0]) {
+                 var $optionOrgNameJenkins = $('<option></option>').val(data[i].orgname[0]).attr('rowid', data[i].orgname_rowid[0]).html(data[i].orgname[0]);
+                 $('#myForm50').find('select#orgname').append($optionOrgNameJenkins).attr('disabled', 'disabled');
+                 $('#myForm50').find('input#jenkinsname').val(data[i].jenkinsname).attr('disabled', 'disabled');
+                 $('#myForm50').find('input#jenkinsurl').val(data[i].jenkinsurl).attr('disabled', 'disabled');
+                 $('#myForm50').find('input#jenkinsusername').val(data[i].jenkinsusername).attr('disabled', 'disabled');
+                 $('#myForm50').find('input#jenkinspassword').val(data[i].jenkinspassword).attr('disabled', 'disabled').removeAttr('type').attr('type','password');
+                 
+                 $('.btn-2 a,.btn-3 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
+                 $('#myForm50').find('button#saveJenkinsWizard').addClass('hidden');
+             }
+         }
+      });
+    }
+
+    getTemplate = function(val, rowid) {
+                            return '<label class="toggle font-sm" style="padding-left:4px;"><input onclick="if($(this).is(&quot;:checked&quot;)) {$(this).closest(&quot;label&quot;).' + 'css(&quot;background-color&quot;,&quot;#eeeeee&quot;);$(this).css(&quot;border-color&quot;,&quot;#3b9ff3&quot;);}else{$(this).closest(&quot;label&quot;).css(&quot;background-color&quot;,&quot;#ffffff&quot;);$(this).css(&quot;border-' + 'color&quot;,&quot;red&quot;);}" type="checkbox" id="checkbox-toggle" name="checkbox-toggle"' + 'value="' + val + '"' + 'rowid="' + rowid + '" style="width:100%"><i data-swchoff-text="NO" data-swchon-text="YES"></i>' + val + '</label>';
+                        };
+  
     $('#orgname').change(function() {
         $('#projectname').empty();
         $.get('/d4dMasters/readmasterjsonnew/4', function(data) {
             for (var i = 0; i < data.length; i++) {
                 if (orgIdForSetup === data[i].orgname_rowid[0]) {
-                    var str = '',
-                        getTemplate = function(val, rowid) {
-                            return '<label class="toggle font-sm" style="padding-left:4px;"><input onclick="if($(this).is(&quot;:checked&quot;)) {$(this).closest(&quot;label&quot;).' + 'css(&quot;background-color&quot;,&quot;#eeeeee&quot;);$(this).css(&quot;border-color&quot;,&quot;#3b9ff3&quot;);}else{$(this).closest(&quot;label&quot;).css(&quot;background-color&quot;,&quot;#ffffff&quot;);$(this).css(&quot;border-' + 'color&quot;,&quot;red&quot;);}" type="checkbox" id="checkbox-toggle" name="checkbox-toggle"' + 'value="' + val + '"' + 'rowid="' + rowid + '" style="width:100%"><i data-swchoff-text="NO" data-swchon-text="YES"></i>' + val + '</label>';
-                        };
+                    var str = '';
                     str = str + getTemplate(data[i].projectname, data[i].rowid);
                     $('#projectname').append(str);
                 }
@@ -192,56 +329,34 @@ <h4 class="modal-title">
     });
     $('#orgname').trigger('change');
 
-    var devopsRolesWizard = $('<ol class="bwizard-steps clearfix clickable"><li aria-selected="true" class="btn-2 nexusCreate active" id="nexusCreate" style="z-index: 4;"><span class="label badge-inverse">1</span><a href="ajax/Settings/devopsRolesWizard.html" class="hidden-phone">Nexus Configuration</a><a href="ajax/Settings/devopsRolesWizard.html" class="hidden-phone"></a><a href="ajax/Settings/devopsRolesWizard.html" class="hidden-phone"></a></li><li aria-selected="true" style="z-index: 3;" id="dockerCreate" class="btn-3 dockerCreate"><span class="label">2</span><a href="ajax/Settings/dockerWizard.html" class="hidden-phone">Docker Configuration</a><a href="ajax/Settings/dockerWizard.html" class="hidden-phone"></a><a href="ajax/Settings/dockerWizard.html" class="hidden-phone"></a></li><li aria-selected="true" style="z-index: 2;" id="jenkinsCreate" class="btn-4 jenkinsCreate"><span class="label btn-1">3</span><a href="ajax/Settings/jenkinsWizard.html" class="hidden-phone">Jenkins Configuration</a><a href="ajax/Settings/jenkinsWizard.html" class="hidden-phone"></a><a href="ajax/Settings/jenkinsWizard.html" class="hidden-phone"></a></li></ol>');
-    $('.wizardFlow').append(devopsRolesWizard);
+    
     $('.btn-2 a').click(function(e) {
         e.preventDefault();
         clicked = false;
         $('.contentSetting').load(this.getAttribute('href'));
     });
     $('.btn-3 a').click(function(e) {
+       clicked = true;
         e.preventDefault();
         $('.content').empty();
         $('.btn-2 a,.btn-4 a').parent('.bwizard-steps li').removeClass('active');
         $(this).parent('.bwizard-steps li').addClass('active');
         $('.content').load(this.getAttribute('href'));
+        getDockerDetailsOnEdit();
     });
     $('.btn-4 a').click(function(e) {
+        clicked = true;
         e.preventDefault();
         $('.content').empty();
         $('.btn-2 a,.btn-3 a').parent('.bwizard-steps li').removeClass('active');
         $(this).parent('.bwizard-steps li').addClass('active');
+        getJenkinsOnEdit();
         $('.content').load(this.getAttribute('href'));
     });
 
-    $(document).ready(function(e) {
-        //api call for getting the status of wizard
-        if(clicked){
-          $('#wizardActionListLoader').show();
-            $.get('/setting-wizard/org/' + orgIdForSetup, function(data) {
-                if (data.currentStep.nestedSteps) {
-                    var nestedSteps = data.currentStep.nestedSteps;
-                    if (nestedSteps[0].name === 'Nexus' && nestedSteps[0].isCompleted === true &&
-                        nestedSteps[1].name === 'Docker' && nestedSteps[1].isCompleted === false &&
-                        nestedSteps[2].name === 'Jenkins' && nestedSteps[2].isCompleted === false) {
-                        $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
-                        $('.contentSetting').find('ol li#dockerCreate').addClass('active');
-                        $('.content').load('ajax/Settings/dockerWizard.html');
-                    } else if (nestedSteps[0].name === 'Nexus' && nestedSteps[0].isCompleted === true &&
-                        nestedSteps[1].name === 'Docker' && nestedSteps[1].isCompleted === true &&
-                        nestedSteps[2].name === 'Jenkins' && nestedSteps[2].isCompleted === false) {
-                        $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
-                        $('.contentSetting').find('ol li#dockerCreate').removeClass('active').addClass('green-btn');
-                        $('.contentSetting').find('ol li#jenkinsCreate').addClass('active');
-                        $('.content').load('ajax/Settings/jenkinsWizard.html');
-                    } else {
 
-                    }
-                }
-            });
-            $('#wizardActionListLoader').hide();
-        }
-    });
+
+
     if (!$.fn.dataTable.isDataTable('#tablerepositoryDetails')) {
         $repoDetails = $('#tablerepositoryDetails').DataTable({
             "pagingType": "full_numbers",
@@ -296,7 +411,6 @@ <h4 class="modal-title">
             var $tr = $('<tr class="repoDetailsRow"></tr>');
             var $tdName = $('<td class="tdrepoName" value=' + repoName + ' style="word-break: break-word;"></td>');
             $tr.data('repoName', repoName);
-
             $tdName.append(repoName);
             var $tdAction = $('<td/>');
             $tdAction.append('<div style="margin-right:17px;float:right;" class="btn-group"><button class="deleteRow" value="Remove" title="Remove"><i class="ace-icon fa fa-trash-o bigger-120"></i></button></div>');
@@ -372,7 +486,7 @@ <h4 class="modal-title">
     $("#nexusservername").focus();
     //form validation for dashboard save
 
-    $("#saveProviderWizard").click(function(e) {
+    $("#saveNexusWizard").click(function(e) {
         var repositories = {
             nexus: []
         };
@@ -437,5 +551,6 @@ <h4 class="modal-title">
         $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
         $('.contentSetting').find('ol li#dockerCreate').addClass('active');
         $('.content').load('ajax/Settings/dockerWizard.html');
+        getDockerDetailsOnEdit();
     });
 </script>
\ No newline at end of file
diff --git a/client/htmls/private/ajax/Settings/dockerWizard.html b/client/htmls/private/ajax/Settings/dockerWizard.html
index f73ca6a1b..f845ddadb 100644
--- a/client/htmls/private/ajax/Settings/dockerWizard.html
+++ b/client/htmls/private/ajax/Settings/dockerWizard.html
@@ -124,16 +124,14 @@ <h4 class="modal-title">
 
     var $option = $('<option></option>').val(orgNameForSetup).attr('rowid',orgIdForSetup).html(orgNameForSetup);
     $('#orgname').append($option);
-
+    getDockerDetailsOnEdit();
     $('#orgname').change(function() {
        $('#projectname').empty();
+       var str = '';
         $.get('/d4dMasters/readmasterjsonnew/4', function(data) {
            for (var i = 0; i < data.length; i++) {
-               if (orgIdForSetup === data[i].orgname_rowid[0]) {
-                   var str = '',
-                       getTemplate = function(val, rowid) {
-                           return '<label class="toggle font-sm" style="padding-left:4px;"><input onclick="if($(this).is(&quot;:checked&quot;)) {$(this).closest(&quot;label&quot;).' + 'css(&quot;background-color&quot;,&quot;#eeeeee&quot;);$(this).css(&quot;border-color&quot;,&quot;#3b9ff3&quot;);}else{$(this).closest(&quot;label&quot;).css(&quot;background-color&quot;,&quot;#ffffff&quot;);$(this).css(&quot;border-' + 'color&quot;,&quot;red&quot;);}" type="checkbox" id="checkbox-toggle" name="checkbox-toggle"' +'value="'+ val +'"' + 'rowid="' + rowid + '" style="width:100%"><i data-swchoff-text="NO" data-swchon-text="YES"></i>' + val + '</label>';
-                       };
+               if (orgIdForSetup === data[i].orgname_rowid[0]) {     
+                  str = '';
                    str = str + getTemplate(data[i].projectname, data[i].rowid);
                    $('#projectname').append(str);
                }
@@ -236,5 +234,6 @@ <h4 class="modal-title">
         $('.content').load('ajax/Settings/jenkinsWizard.html');
         $('.contentSetting').find('ol li#dockerCreate').removeClass('active').addClass('green-btn');
         $('.contentSetting').find('ol li#jenkinsCreate').addClass('active');
+        getJenkinsOnEdit();
     });
 </script>
\ No newline at end of file
diff --git a/client/htmls/private/ajax/Settings/envWizard.html b/client/htmls/private/ajax/Settings/envWizard.html
index 19edda6ad..96ff8127b 100644
--- a/client/htmls/private/ajax/Settings/envWizard.html
+++ b/client/htmls/private/ajax/Settings/envWizard.html
@@ -3,11 +3,6 @@
         <div class="widget-box">
             <div class="widget-header">
                <h4 class="widget-margin" style="color:black;">Create Environment
-               <span class="widget-toolbar no-border">
-                  <div class="wizardAdd">
-                     <a href="ajax/Settings/envWizard.html" id="createNewEnv" style="margin-right:11px;" class="btn btn-primary"><i class="ace-icon ace-icon fa fa-plus bigger-110"></i>&nbsp;Add New Env</a>             
-                  </div>
-              </span>
               </h4>
             </div>
             <div class="widget-body">
@@ -115,6 +110,7 @@ <h4 class="modal-title">Add a Chef Environment</h4>
 $(document).ready(function(e){
    var $optionOrg = $('<option></option>').val(orgNameForSetup).attr('rowid', orgIdForSetup).html(orgNameForSetup);
    $('#orgname').append($optionOrg);
+   getEnvValues();
    $('#orgname').change(function() {
        $('#projectname').empty();
        $.get('/d4dMasters/readmasterjsonnew/10', function(data) {
@@ -128,10 +124,7 @@ <h4 class="modal-title">Add a Chef Environment</h4>
        $.get('/d4dMasters/readmasterjsonnew/4', function(data) {
            for (var i = 0; i < data.length; i++) {
                if (orgIdForSetup === data[i].orgname_rowid[0]) {
-                   var str = '',
-                       getTemplate = function(val, rowid) {
-                           return '<label class="toggle font-sm" style="padding-left:4px;"><input onclick="if($(this).is(&quot;:checked&quot;)) {$(this).closest(&quot;label&quot;).' + 'css(&quot;background-color&quot;,&quot;#eeeeee&quot;);$(this).css(&quot;border-color&quot;,&quot;#3b9ff3&quot;);}else{$(this).closest(&quot;label&quot;).css(&quot;background-color&quot;,&quot;#ffffff&quot;);$(this).css(&quot;border-' + 'color&quot;,&quot;red&quot;);}" type="checkbox" id="checkbox-toggle" name="checkbox-toggle"' +'value="'+ val +'"' + 'rowid="' + rowid + '" style="width:100%"><i data-swchoff-text="NO" data-swchon-text="YES"></i>' + val + '</label>';
-                       };
+                   var str = '';
                    str = str + getTemplate(data[i].projectname, data[i].rowid);
                    $('#projectname').append(str);
                }
@@ -249,15 +242,11 @@ <h4 class="modal-title">Add a Chef Environment</h4>
       $('.content').load(this.getAttribute('href'));
     });
    $(".nextFormWizard").click(function() {
-       $('.content').empty();
-       if(configWizardEditValue){
-          getTeamValues();
-       }
-       $('.btn-2 a').removeClass('not-activeAnchor');
-       $('.btn-3 a').removeClass('not-activeAnchor');
-       $('.btn-3 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
-       $('.contentSetting').find('ol li#teamCreate').addClass('active');
-       $('.content').load('ajax/Settings/teamWizard.html');
+       toastr.success('Step 2 - Config Management Setup Completed');
+       $('#userConfiguration a').attr('href','ajax/Settings/userManagementWizard.html');
+       $('#startConfig a, #orgConfiguration a,#configManagement a').addClass('green-btn').removeClass('process-btn');
+       $('.wizardFlow').empty();
+       $('#userConfiguration a').trigger('click');
    });
 });
 </script>
\ No newline at end of file
diff --git a/client/htmls/private/ajax/Settings/galleryWizard.html b/client/htmls/private/ajax/Settings/galleryWizard.html
index b9c336785..9088ad0f3 100644
--- a/client/htmls/private/ajax/Settings/galleryWizard.html
+++ b/client/htmls/private/ajax/Settings/galleryWizard.html
@@ -31,7 +31,8 @@ <h4 class="widget-margin" style="color:black;">Create Templates</h4>
                      </div>
                      <div class="col-lg-6 col-md-6 margintop20">
                         <label for="">Template Type:<span class="control-label redSpan">&nbsp;*</span></label>
-                        <select id="templatetypename" ignoreoption="OSImage" class="choosetemplateType width-100 form-control" sourcepath="16" ignoreComposite="Composite"  cdata="catalyst" datapath="masterjson.rows.row" onChange="if($(this).val().indexOf('Docker') >= 0) {$('.forDocker').show(); $('.notforDocker').hide();$('.notCFT').hide();}else {$('.forDocker').hide();$('.notforDocker').show();$('.forCFT').hide();}if($(this).val().indexOf('CloudFormation') >=0 || $(this).val().indexOf('ARMTemplate') >=0){$('.forDocker').hide(); $('.notforDocker').hide(); $('.forCFT').show();}">
+                        <select id="templatetypename" class="choosetemplateType width-100 form-control" sourcepath="16" cdata="catalyst" datapath="masterjson.rows.row" onChange="if($(this).val().indexOf('Docker') >= 0) {$('.forDocker').show(); $('.notforDocker').hide();$('.notCFT').hide();}else {$('.forDocker').hide();$('.notforDocker').show();$('.forCFT').hide();}if($(this).val().indexOf('CloudFormation') >=0 || $(this).val().indexOf('ARMTemplate') >=0){$('.forDocker').hide(); $('.notforDocker').hide(); $('.forCFT').show();}">
+                          <option>Select Template Type</option>
                         </select>
                      </div>
                      <div class="col-lg-6 col-md-6" hidden>
@@ -103,7 +104,7 @@ <h4 class="widget-margin" style="color:black;">Create Templates</h4>
       </div>
       <div class="widget-toolbox clearfix">
             <div class="btn-group pull-right">
-             <button name="next1" id="saveProviderWizard" style="margin-right:11px;" class="saveFormWizard btn btn-primary"><i class="ace-icon fa fa-check bigger-110"></i>&nbsp;Save</i></button>
+             <button name="next1" id="saveTemplateWizard" style="margin-right:11px;" class="saveFormWizard btn btn-primary"><i class="ace-icon fa fa-check bigger-110"></i>&nbsp;Save</i></button>
              <input type="button" name="next1" id="next1" class="nextFormWizard btn btn-primary" value="Next"/>
           </div>
        </div>
@@ -116,10 +117,10 @@ <h4 class="widget-margin" style="color:black;">Create Templates</h4>
         orgIdForSetup = $('#orgDropdown option:selected').val();
         var $option = $('<option></option>').val(orgNameForSetup).attr('rowid', orgIdForSetup).html(orgNameForSetup);
         $('#orgname').append($option);
-        var wizardFlowGallery = $('<ol class="bwizard-steps clearfix clickable"><li aria-selected="true" id="templatesCreate" class="active btn-2 templatesCreate" style="z-index: 4;"><span class="label badge-inverse">1</span><a href="ajax/Settings/galleryWizard.html" class="hidden-phone">Create Templates</a></li><li aria-selected="false" style="z-index: 3;" id="serviceCreate" class="btn-3 serviceCreate"><span class="label">2</span><a href="ajax/Settings/serviceCommandWizard.html" class="hidden-phone">Service Command</a></li><li aria-selected="false" style="z-index: 3;" id="scriptCreate" class="btn-4 scriptCreate"><span class="label">3</span><a href="ajax/Settings/scriptWizard.html" class="hidden-phone">Script Gallery</a></li></ol>');
+        var wizardFlowGallery = $('<ol class="bwizard-steps bwizard-stepsGallery clearfix clickable"><li aria-selected="true" id="templatesCreate" class="active btn-2 templatesCreate" style="z-index: 4;"><span class="label badge-inverse">1</span><a href="ajax/Settings/galleryWizard.html" class="hidden-phone">Create Templates</a></li><li aria-selected="false" style="z-index: 3;" id="serviceCreate" class="btn-3 serviceCreate"><span class="label">2</span><a href="ajax/Settings/serviceCommandWizard.html" class="hidden-phone">Service Command</a></li><li aria-selected="false" style="z-index: 3;" id="scriptCreate" class="btn-4 scriptCreate"><span class="label">3</span><a href="ajax/Settings/scriptWizard.html" class="hidden-phone">Script Gallery</a></li></ol>');
         $('.wizardFlow').append(wizardFlowGallery);
 
-        /*function getTemplateValues() {
+        function getTemplateValues() {
           $.get('/d4dMasters/readmasterjsonnew/17',function(data){
             $('#myForm6').find('select#orgname').empty();
             $('#myForm6').find('select#dockerreponame').empty();
@@ -129,32 +130,81 @@ <h4 class="widget-margin" style="color:black;">Create Templates</h4>
                   var $optionOrg = $('<option></option>').val(orgNameForSetup).attr('rowid', orgIdForSetup).html(orgNameForSetup);
                   $('#orgname').append($optionOrg).attr('disabled','disabled');
                   var $optionDockerRepoName = $('<option></option>').val(data[i].dockerreponame).html(data[i].dockerreponame);
+                  var $optionTemplateName = $('<option></option>').val(data[i].templatetypename).html(data[i].templatetypename);
                   $('#myForm6').find('input#templatename').val(data[i].templatename).attr('disabled','disabled');
-                  $('#myForm6').find('select#templatetypename').val(data[i].templatetypename).attr('disabled','disabled');
+                  $('#myForm6').find('select#templatetypename').append($optionTemplateName).attr('disabled','disabled');
                   $('#myForm6').find('select#dockerreponame').append($optionDockerRepoName).attr('disabled','disabled');
                   $('#myForm6').find('input#dockercontainers').val(data[i].dockercontainerpaths).attr('disabled','disabled');
+                   $('#myForm6').find('button#saveTemplateWizard').addClass('hidden');
+                   
                 }
             }
           });
-        }*/
+        }
+
+        function getServiceCommandValues() {
+            $.get('/d4dMasters/readmasterjsonnew/19',function(data){
+            $('#myForm50').find('select#orgname').empty();
+            for(var i =0;i<data.length;i++){
+                if(orgIdForSetup === data[i].orgname_rowid[0]) {  
+                  var $optionOrg = $('<option></option>').val(orgNameForSetup).attr('rowid', orgIdForSetup).html(orgNameForSetup);
+                  var $optionConfigNameEnv = $('<option></option>').val(data[i].configname).attr('rowid', data[i].configname_rowid).html(data[i].configname);
+                  var $optionServiceCookBook = $('<option></option>').val(data[i].servicecookbook).html(data[i].servicecookbook);
+                  $('#myForm50').find('select#orgname').append($optionOrg).attr('disabled','disabled');
+                  
+                  $('#myForm50').find('input#servicename').val(data[i].servicename).attr('disabled','disabled');
+                  $('#myForm50').find('select#configname').append($optionConfigNameEnv).attr('disabled', 'disabled');
+                  $('#myForm50').find('select#servicecookbook').append($optionServiceCookBook).attr('disabled', 'disabled');
+                  $('#myForm50').find('select#commandtype').remove();
+                  $('#myForm50').find('input#commandtype').removeClass('hidden').val(data[i].commandtype).attr('disabled','disabled');
+                  $('#myForm50').find('button#saveServiceWizard').addClass('hidden');
+                }
+            }
+          });
+        }
+
+        function getScriptGallery() {
+          $('#fileNameDisplay').empty();
+          $.get('/scripts',function(data){
+            console.log(data.data);
+              for(var i =0;i<data.data.length;i++){
+                if(orgIdForSetup === data.data[i].orgDetails.id){
+                  $('#scriptForm').find('input#scriptName').val(data.data[i].name).attr('disabled','disabled');
+                  var $optionOrgScript = $('<option></option>').val(orgNameForSetup).attr('rowid', orgIdForSetup).html(orgNameForSetup);
+                  var $optionScriptType = $('<option></option>').val(data.data[i].type).html(data.data[i].type);
+                  $('#scriptForm').find('select#orgName').append($optionOrgScript).attr('disabled','disabled');
+                  $('#scriptForm').find('select#scriptType').append($optionScriptType).attr('disabled','disabled');
+                  $('#scriptForm').find('input#scriptDescription').val(data.data[i].description).attr('disabled','disabled');
+                  $('#scriptForm').find('input#scriptDescription').val(data.data[i].description).attr('disabled','disabled');
+                  $('#scriptForm').find('#fileNameDisplay').append(data.data[i].fileName);
+                  $('#scriptForm').find('button#saveScriptWizard').addClass('hidden');
+                }
+              }
+          });
+        }
         $('.btn-2 a').click(function(e) {
             e.preventDefault();
             clicked = false;
             $('.contentSetting').load(this.getAttribute('href'));
+            //$('.btn-3 a,.btn-4 a').parent('.bwizard-steps li').removeClass('active');
         });
         $('.btn-3 a').click(function(e) {
+          clicked = true;
             e.preventDefault();
             $('.content').empty();
-            $('.btn-2 a').parent('.bwizard-steps li').removeClass('active')
+            getServiceCommandValues();
+            $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
             $(this).parent('.bwizard-steps li').addClass('active');
             $('.content').load(this.getAttribute('href'));
         });
         $('.btn-4 a').click(function(e) {
+            clicked = true;
             e.preventDefault();
             $('.content').empty();
-            $('.btn-2 a,.btn-3 a').parent('.bwizard-steps li').removeClass('active');
+            $('.btn-2 a,.btn-3 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
             $(this).parent('.bwizard-steps li').addClass('active');
             $('.content').load(this.getAttribute('href'));
+            getScriptGallery();
         });
 
         
@@ -174,28 +224,35 @@ <h4 class="widget-margin" style="color:black;">Create Templates</h4>
           if(orgIdForSetup){
               $('#wizardActionListLoader').show();
                 $.get('/setting-wizard/org/' + orgIdForSetup, function(data) {
-                if (data.currentStep.nestedSteps) {
-                    var nestedSteps = data.currentStep.nestedSteps;
-                    if (nestedSteps[0].name === 'Templates' && nestedSteps[0].isCompleted === true &&
-                        nestedSteps[1].name === 'ServiceCommand' && nestedSteps[1].isCompleted === false &&
-                        nestedSteps[2].name === 'ScriptGallery' && nestedSteps[2].isCompleted === false) {
-                        $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
-                        $('.contentSetting').find('ol li#serviceCreate').addClass('active');
-                        $('.content').load('ajax/Settings/serviceCommandWizard.html');
-                    } else if (nestedSteps[0].name === 'Templates' && nestedSteps[0].isCompleted === true &&
-                        nestedSteps[1].name === 'ServiceCommand' && nestedSteps[1].isCompleted === true &&
-                        nestedSteps[2].name === 'ScriptGallery' && nestedSteps[2].isCompleted === false) {
-                        $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
-                        $('.contentSetting').find('ol li#serviceCreate').removeClass('active').addClass('green-btn');
-                        $('.contentSetting').find('ol li#scriptCreate').addClass('active');
-                        $('.content').load('ajax/Settings/scriptWizard.html');
-                    } else {}
-                }
+                if (data.currentStep.name === 'Gallery Setup') {
+                  if (data.currentStep.nestedSteps) {
+                      var nestedSteps = data.currentStep.nestedSteps;
+                      if (nestedSteps[0].name === 'Templates' && nestedSteps[0].isCompleted === true &&
+                          nestedSteps[1].name === 'ServiceCommand' && nestedSteps[1].isCompleted === false &&
+                          nestedSteps[2].name === 'ScriptGallery' && nestedSteps[2].isCompleted === false) {
+                          $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
+                          $('.contentSetting').find('ol li#serviceCreate').addClass('active');
+                          $('.content').load('ajax/Settings/serviceCommandWizard.html');
+                      } else if (nestedSteps[0].name === 'Templates' && nestedSteps[0].isCompleted === true &&
+                          nestedSteps[1].name === 'ServiceCommand' && nestedSteps[1].isCompleted === true &&
+                          nestedSteps[2].name === 'ScriptGallery' && nestedSteps[2].isCompleted === false) {
+                          $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
+                          $('.contentSetting').find('ol li#serviceCreate').removeClass('active').addClass('green-btn');
+                          $('.contentSetting').find('ol li#scriptCreate').addClass('active');
+                          $('.content').load('ajax/Settings/scriptWizard.html');
+                      } else {
+
+                      }
+                  } 
+              } else {
+                getTemplateValues();
+                $('.btn-3 a,.btn-4 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
+              }
             });
             $('#wizardActionListLoader').hide();
           }
         } else {
-            //getTemplateValues();
+            getTemplateValues();
             $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
         }
     });
diff --git a/client/htmls/private/ajax/Settings/jenkinsWizard.html b/client/htmls/private/ajax/Settings/jenkinsWizard.html
index 01f5abddd..6ef5d9854 100644
--- a/client/htmls/private/ajax/Settings/jenkinsWizard.html
+++ b/client/htmls/private/ajax/Settings/jenkinsWizard.html
@@ -40,7 +40,7 @@ <h4 class="widget-margin" style="color:black;">Create Jenkins</h4>
          </div>
          <div class="widget-toolbox clearfix">
             <div class="btn-group pull-right">
-             <button name="next1" id="saveProviderWizard" style="margin-right:11px;" class="saveFormWizard btn btn-primary"><i class="ace-icon fa fa-check bigger-110"></i>&nbsp;Save</i></button>
+             <button name="next1" id="saveJenkinsWizard" style="margin-right:11px;" class="saveFormWizard btn btn-primary"><i class="ace-icon fa fa-check bigger-110"></i>&nbsp;Save</i></button>
              <input type="button" name="next1" id="next1" class="nextFormWizard btn btn-primary" value="Next"/>
           </div>
        </div>
@@ -48,6 +48,9 @@ <h4 class="widget-margin" style="color:black;">Create Jenkins</h4>
    </div>
 </form>
 <script>
+$(document).ready(function(e){
+    getJenkinsOnEdit();
+});
     var $option = $('<option></option>').val(orgNameForSetup).attr('rowid',orgIdForSetup).html(orgNameForSetup);
     $('#orgname').append($option);
     $('#orgname').trigger('change');
@@ -64,10 +67,7 @@ <h4 class="widget-margin" style="color:black;">Create Jenkins</h4>
    
 
      $(".nextFormWizard").click(function(){
-        $('#cmdbConfiguration a').attr('href','ajax/Settings/cmdbWizard.html');
-        $('#cmdbConfiguration a').trigger('click');
         toastr.success('Step 5 - Devops Roles Configuration Completed');
-        $('#startConfig a, #orgConfiguration a,#configManagement a,#providerConfiguration a,#galleryConfiguration a').addClass('green-btn').removeClass('process-btn');
-        $('.wizardFlow').empty();
+        toastr.success('Wizard Has been successfully configured');
     });
 </script>
\ No newline at end of file
diff --git a/client/htmls/private/ajax/Settings/providerWizard.html b/client/htmls/private/ajax/Settings/providerWizard.html
index 06e274c4a..71c0f2f25 100644
--- a/client/htmls/private/ajax/Settings/providerWizard.html
+++ b/client/htmls/private/ajax/Settings/providerWizard.html
@@ -265,7 +265,7 @@ <h4 class="widget-margin" style="color:black;">Create Provider
    var $option = $('<option></option>').val(orgIdForSetup).html(orgNameForSetup);
    var providerIdForImage;
    $('#orgId').append($option);
-       var providerWizardFlow = $('<ol id="providerWizard" class="bwizard-steps clearfix clickable"><li aria-selected="true" id="providerCreate" class="active btn-2 providerCreate" style="z-index: 4;"><span class="label badge-inverse">1</span><a href="ajax/Settings/providerWizard.html" class="hidden-phone">Create Providers</a></li><li aria-selected="true" style="z-index: 3;" id="imageCreate" class="btn-3 imageCreate"><span class="label">2</span><a href="ajax/Settings/vmImageWizard.html" class="not-activeAnchor hidden-phone">Create VmImages</a></li></ol>');
+       var providerWizardFlow = $('<ol id="providerWizard" class="bwizard-steps bwizard-stepsProviderConfig clearfix clickable"><li aria-selected="true" id="providerCreate" class="active btn-2 providerCreate" style="z-index: 4;"><span class="label badge-inverse">1</span><a href="ajax/Settings/providerWizard.html" class="hidden-phone">Create Providers</a></li><li aria-selected="true" style="z-index: 3;" id="imageCreate" class="btn-3 imageCreate"><span class="label">2</span><a href="ajax/Settings/vmImageWizard.html" class="not-activeAnchor hidden-phone">Create VmImages</a></li></ol>');
        $('.wizardFlow').append(providerWizardFlow);
 
        function getProviderValues() {
@@ -295,7 +295,7 @@ <h4 class="widget-margin" style="color:black;">Create Provider
                        $("input[name='isDefault']").attr('disabled', true);
                        $('.aws-secret-info').hide();
                        $('.secretInfo').removeAttr('cat-validation');
-                       $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
+                      // $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
                        $('.saveFormWizard').addClass('hidden');
                        $('.nextFormWizard').removeAttr('disabled');
                    }
@@ -335,12 +335,14 @@ <h4 class="widget-margin" style="color:black;">Create Provider
            $('.contentSetting').load(this.getAttribute('href'));
        });
        $('.btn-3 a').click(function(e) {
+           clicked = true;
            e.preventDefault();
            $('.nextFormWizard').removeAttr('disabled');
-           $('.btn-2 a').parent('.bwizard-steps li').removeClass('active')
+           $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
            $(this).parent('.bwizard-steps li').addClass('active');
            $('.content').load(this.getAttribute('href'));
            getVmImages();
+           $('.btn-3 a').parent('.bwizard-steps li').removeClass('green-btn').addClass('active');
        });
        //api call for getting the status of wizard
 
@@ -361,7 +363,7 @@ <h4 class="widget-margin" style="color:black;">Create Provider
                } else {
                    getProviderValues();
                    $('.btn-3 a').removeClass('not-activeAnchor');
-                   $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
+                   $('.btn-2 a').parent('.bwizard-steps li').addClass('active');
                    $('.btn-3 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
                }
            });
diff --git a/client/htmls/private/ajax/Settings/scriptWizard.html b/client/htmls/private/ajax/Settings/scriptWizard.html
index 36a72294a..2ba5e9884 100644
--- a/client/htmls/private/ajax/Settings/scriptWizard.html
+++ b/client/htmls/private/ajax/Settings/scriptWizard.html
@@ -32,7 +32,6 @@ <h4 class="widget-margin" style="color:black;">Create Scripts</h4>
                             <label for="">Script Type:<span class="control-label redSpan">&nbsp;*</span></label>
                             <div class="input-groups">
                               <select id="scriptType" name="scriptType" class="required form-control width-100" style="vertical-align:central">
-                                <option value="">Choose Type</option>
                                 <option value="Bash">Bash</option>
                               </select>
                             </div>
@@ -63,7 +62,7 @@ <h4 class="widget-margin" style="color:black;">Create Scripts</h4>
          </div>
          <div class="widget-toolbox clearfix">
             <div class="btn-group pull-right">
-             <button type="submit" name="next1" id="saveProviderWizard" style="margin-right:11px;" class="saveFormWizard btn btn-primary"><i class="ace-icon fa fa-check bigger-110"></i>&nbsp;Save</i></button>
+             <button type="submit" name="next1" id="saveScriptWizard" style="margin-right:11px;" class="saveFormWizard btn btn-primary"><i class="ace-icon fa fa-check bigger-110"></i>&nbsp;Save</i></button>
              <input type="button" name="next1" id="next1" class="nextFormWizard btn btn-primary" value="Next"/>
           </div>
        </div>
@@ -76,8 +75,8 @@ <h4 class="widget-margin" style="color:black;">Create Scripts</h4>
     orgIdForSetup = $('#orgDropdown option:selected').val();
     var $optionOrgScript = $('<option></option>').val(orgIdForSetup).attr('rowid',orgIdForSetup).html(orgNameForSetup);
     $('#orgName').append($optionOrgScript);
+
   });
-    
     function setfilename(val){
       $('#fileNameDisplay').empty();
       var fileName = val.substr(val.lastIndexOf("\\")+1, val.length);
diff --git a/client/htmls/private/ajax/Settings/serviceCommandWizard.html b/client/htmls/private/ajax/Settings/serviceCommandWizard.html
index a082ac607..538e19f92 100644
--- a/client/htmls/private/ajax/Settings/serviceCommandWizard.html
+++ b/client/htmls/private/ajax/Settings/serviceCommandWizard.html
@@ -32,6 +32,7 @@ <h4 class="widget-margin" style="color:black;">Create Services</h4>
                               <option value="Chef Cookbook/Recipe">Chef Cookbook/Recipe</option>
                               <option value="Service Command">Service Command</option>
                            </select>
+                           <input type="text" class="hidden form-control" id="commandtype"/>
                         </div>
                         <div class="col-lg-6 col-md-6 chooseChefServer margintop15">
                            <label class="">
@@ -154,7 +155,7 @@ <h4 class="widget-margin" style="color:black;">Create Services</h4>
          </div>
          <div class="widget-toolbox clearfix">
             <div class="btn-group pull-right">
-             <button name="next1" id="saveProviderWizard" style="margin-right:11px;" class="saveFormWizard btn btn-primary"><i class="ace-icon fa fa-check bigger-110"></i>&nbsp;Save</i></button>
+             <button name="next1" id="saveServiceWizard" style="margin-right:11px;" class="saveFormWizard btn btn-primary"><i class="ace-icon fa fa-check bigger-110"></i>&nbsp;Save</i></button>
              <input type="button" name="next1" id="next1" class="nextFormWizard btn btn-primary" value="Next"/>
           </div>
        </div>
diff --git a/client/htmls/private/ajax/Settings/settingsWizard.html b/client/htmls/private/ajax/Settings/settingsWizard.html
index eeda33d15..8a4aeae4e 100644
--- a/client/htmls/private/ajax/Settings/settingsWizard.html
+++ b/client/htmls/private/ajax/Settings/settingsWizard.html
@@ -44,7 +44,7 @@ <h4 class="widget-margin" style="color:black;">Create Organization</h4>
 </div>
 
 <script>
-var wizardSteps = $('<ol id="wizardTab" class="bwizard-steps clearfix clickable" role="tablist"><li aria-selected="true" class="btn-2 orgCreate active" id="orgCreate" style="z-index: 4;"><span class="label badge-inverse">1</span><a href="ajax/Settings/settingsWizard.html" class="hidden-phone">Create Organization </a></li><li aria-selected="true" style="z-index: 3;" id="bgCreate" class="btn-3 bgCreate"><span class="label">2</span><a href="ajax/Settings/bgWizard.html" class="not-activeAnchor hidden-phone">Create Business group</a></li><li aria-selected="true" style="z-index: 2;" id="projectCreate" class="btn-4 projectCreate"><span class="label btn-1">3</span><a href="ajax/Settings/projWizard.html" class="not-activeAnchor hidden-phone">Create New Project</a></li></ol>');
+var wizardSteps = $('<ol id="wizardTab" class="bwizard-steps bwizard-stepsOrgConfig clearfix clickable" role="tablist"><li aria-selected="true" class="btn-2 orgCreate active" id="orgCreate" style="z-index: 4;"><span class="label badge-inverse">1</span><a href="ajax/Settings/settingsWizard.html" class="hidden-phone">Organization </a></li><li aria-selected="true" style="z-index: 3;" id="bgCreate" class="btn-3 bgCreate"><span class="label">2</span><a href="ajax/Settings/bgWizard.html" class="not-activeAnchor hidden-phone">Business group</a></li><li aria-selected="true" style="z-index: 2;" id="projectCreate" class="btn-4 projectCreate"><span class="label btn-1">3</span><a href="ajax/Settings/projWizard.html" class="not-activeAnchor hidden-phone">Project</a></li></ol>');
 $('.wizardFlow').append(wizardSteps);
 //getOrgValues();
 
@@ -58,7 +58,7 @@ <h4 class="widget-margin" style="color:black;">Create Organization</h4>
                 $('#myForm').find('input#plannedCost').val(data[i].plannedCost).attr('disabled', 'disabled');
             }
         }
-        $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
+       // $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
         $('.saveFormWizard').addClass('hidden');
     });
 }
@@ -118,6 +118,7 @@ <h4 class="widget-margin" style="color:black;">Create Organization</h4>
 });
 
 $('.btn-3 a').click(function(e) {
+    clicked = true;
     e.preventDefault();
     $('.content').empty();
     if (selectedDropdownValue || lastDropdownValue) {
@@ -131,6 +132,7 @@ <h4 class="widget-margin" style="color:black;">Create Organization</h4>
 });
 
 $('.btn-4 a').click(function(e) {
+    clicked = true;
     e.preventDefault();
     if (selectedDropdownValue) {
       $('.nextFormWizard').removeAttr('disabled');
@@ -141,7 +143,7 @@ <h4 class="widget-margin" style="color:black;">Create Organization</h4>
     }
     $('.content').load(this.getAttribute('href'));
 });
-
+$(document).ready(function(e){
 function wizardStatus(orgIdForSetup) {
   $.get('/setting-wizard/org/' + orgIdForSetup, function(data) {
       if (data.currentStep.name === 'Org Configuration') {
@@ -161,6 +163,7 @@ <h4 class="widget-margin" style="color:black;">Create Organization</h4>
               }
           }
       } else {
+        getOrgValues();
         $('.btn-3 a').removeClass('not-activeAnchor');
         $('.btn-4 a').removeClass('not-activeAnchor');
         $('.nextFormWizard').removeAttr('disabled');
@@ -173,27 +176,30 @@ <h4 class="widget-margin" style="color:black;">Create Organization</h4>
       }
   });
 }
-orgIdForSetup = selectedDropdownValue;
-if (clicked) {
-    if (orgIdForSetup) {
-        wizardStatus(orgIdForSetup);
+
+    orgIdForSetup = selectedDropdownValue;
+    if (clicked) {
+        if (orgIdForSetup) {
+            wizardStatus(orgIdForSetup);
+        } else {
+        }
     } else {
+      //user comes when he is creating a new org setup
+      if(orgIdForSetup){
+        getOrgValues();
+        $('.btn-3 a').removeClass('not-activeAnchor');
+        $('.btn-4 a').removeClass('not-activeAnchor');
+        $('.nextFormWizard').removeAttr('disabled');
+        $('.btn-3 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
+        $('.btn-4 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
+      } else if(lastDropdownValue) {
+          getOrgValues();
+          $('.btn-3 a').removeClass('not-activeAnchor');
+          $('.nextFormWizard').removeAttr('disabled');
+      }
     }
-} else {
-  //user comes when he is creating a new org setup
-  if(orgIdForSetup){
-    getOrgValues();
-    $('.btn-3 a').removeClass('not-activeAnchor');
-    $('.btn-4 a').removeClass('not-activeAnchor');
-    $('.nextFormWizard').removeAttr('disabled');
-    $('.btn-3 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
-    $('.btn-4 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
-  } else if(lastDropdownValue) {
-      getOrgValues();
-      $('.btn-3 a').removeClass('not-activeAnchor');
-      $('.nextFormWizard').removeAttr('disabled');
-  }
-}
+});
+
 
 function activateOrg() {
     $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
diff --git a/client/htmls/private/ajax/Settings/teamWizard.html b/client/htmls/private/ajax/Settings/teamWizard.html
index 0add8e2ae..658e3848b 100644
--- a/client/htmls/private/ajax/Settings/teamWizard.html
+++ b/client/htmls/private/ajax/Settings/teamWizard.html
@@ -58,55 +58,8 @@ <h4 class="widget-margin" style="color:black;">Create Team</h4>
     </form>
 
 <script>
-   var $optionOrgTeam = $('<option></option>').val(orgNameForSetup).attr('rowid', orgIdForSetup).html(orgNameForSetup);
-   $('#orgname').append($optionOrgTeam);
-   $('#orgname').change(function(e){
-        $('#projectname').empty();
-        $('#loginname').empty();
-        var str = '',
-        getTemplate = function(val, rowid) {
-             return '<label class="toggle font-sm" style="padding-left:4px;"><input onclick="if($(this).is(&quot;:checked&quot;)) {$(this).closest(&quot;label&quot;).' + 'css(&quot;background-color&quot;,&quot;#eeeeee&quot;);$(this).css(&quot;border-color&quot;,&quot;#3b9ff3&quot;);}else{$(this).closest(&quot;label&quot;).css(&quot;background-color&quot;,&quot;#ffffff&quot;);$(this).css(&quot;border-' + 'color&quot;,&quot;red&quot;);}" type="checkbox" id="checkbox-toggle" name="checkbox-toggle"' +'value="'+ val +'"' + 'rowid="' + rowid + '" style="width:100%"><i data-swchoff-text="NO" data-swchon-text="YES"></i>' + val + '</label>';
-         };
-       $.get('/d4dMasters/orgs/all/users/7',function(data) {
-            for (var i = 0; i<data.length;i++){
-                if (orgIdForSetup === data[i].orgname_rowid[0]) {
-                   str = str + getTemplate(data[i].loginname, data[i].rowid);
-                   $('#loginname').append(str);
-               } else if(data[i].orgname_rowid[0] === "") {
-                  str = str + getTemplate(data[i].loginname, data[i].rowid);
-                   $('#loginname').append(str);
-               }
-            }
-       });
-       $.get('/d4dMasters/readmasterjsonnew/4', function(data) {
-           str = '';
-           for (var i = 0; i < data.length; i++) {
-               if (orgIdForSetup === data[i].orgname_rowid[0]) {
-                   str = str + getTemplate(data[i].projectname, data[i].rowid);
-                   $('#projectname').append(str);
-               }
-           }
-       });
-   });
-   $('#orgname').trigger('change');
-
-   $('#myForm3').submit(function() {
-           $(this).validate();
    
-           if($(this).valid){
-                /*alert('valid form submitted'); // for demo*/
-               if(!saveform('21'))
-                return false;
-           }else{
-                alert('invalid valid form submitted'); // for demo
-           }
-           return false; // for demo
-       });
    $(".nextFormWizard").click(function() {
-       toastr.success('Step 2 - Config Management Setup Completed');
-       $('#providerConfiguration a').attr('href','ajax/Settings/providerWizard.html');
-       $('#startConfig a, #orgConfiguration a,#configManagement a').addClass('green-btn').removeClass('process-btn');
-       $('.wizardFlow').empty();
-       $('#providerConfiguration a').trigger('click');
+       
    });
 </script>
\ No newline at end of file
diff --git a/client/htmls/private/ajax/Settings/userManagementWizard.html b/client/htmls/private/ajax/Settings/userManagementWizard.html
new file mode 100644
index 000000000..7473fdd52
--- /dev/null
+++ b/client/htmls/private/ajax/Settings/userManagementWizard.html
@@ -0,0 +1,229 @@
+<div class="wizardFlow"></div>
+<!-- fieldsets -->
+<div class="content">
+   
+    <form action="" id="myForm3">
+        <div class="widget-box">
+            <div class="widget-header">
+                <h4 class="widget-margin" style="color:black;">Create Team</h4>
+            </div>
+            <div class="widget-body">
+                <div class="widget-main" style="min-height:350px">
+                    <div class="jarviswidget" data-widget-editbutton="false" data-widget-custombutton="false">
+                        <div>
+                                 <!-- widget content -->
+                                 <div class="widget-body no-padding">
+                                  
+                                  <div class="col-lg-6 col-md-6">
+                                          <label for="name">Name:<span class="control-label redSpan">&nbsp;*</span></label>
+                                          <label id="msgOrgName" style="display:none;color:red;float:right;">Required</label>
+                                          <br>
+                                          <input autofocus name="ctl00$MainContent$orgname" value="" id="teamname" class="form-control" type="text"  cdata="catalyst" cat-validation="required,nospecial,max22,nospace"  unique="true"  uniqueconditionedby="teamname">
+                                       
+                                       </div>
+                                       <div class="col-lg-6 col-md-6">
+                                          <label for="name">Description:</label>
+                                          <input name="ctl00$MainContent$orgname" value="" id="description" class="form-control" type="text"  cdata="catalyst" maxlength="50">
+                                       </div>
+                                  <div class="col-lg-6 col-md-6 margintop20">
+                                          <label for="">Organization:<span class="control-label redSpan">&nbsp;*</span></label>
+                                          <select id="orgname" class="form-control chooseOrganization width-100" sourcepath="1" datapath="masterjson.rows.row" linkedfields="['projectname','loginname']"  cdata="catalyst" cat-validation="required">
+                                            
+                                          </select>
+                                       </div>
+                                    
+                                 <div class="col-lg-6 col-md-6 smart-form margintop20">
+                                    <label for="category">Users:</label>
+                                    <div  id="loginname" multiselect="multiselect" datatype="select" datapath="masterjson.rows.row"  class="input-group from-control col-md-12" style="height:150px;overflow-y:auto;padding:2px;border:1px solid silver;width:100%" sourcepath="7" cdata="catalyst" linkedto="orgname">
+                                    </div>
+                                 </div>
+                                 <div class="col-lg-6 col-md-6 smart-form margintop20">
+                                    <label for="category">Assign Projects:</label>
+                                    <div  id="projectname" sourcepath="4" multiselect="multiselect" datatype="select" datapath="masterjson.rows.row"  class="input-group from-control col-md-12" style="height:150px;overflow-y:auto;padding:2px;border:1px solid silver;width:100%" cdata="catalyst" linkedto="orgname" >
+                                    </div>
+                                 </div>
+                                
+
+                                 
+                                 <!-- end widget content -->
+                                 </div>
+                              </div>
+                    </div>
+                </div>
+            </div>
+            <div class="widget-toolbox clearfix">
+                <div class="btn-group pull-right">
+                 <button name="next1" id="saveConfigTeam" style="margin-right:11px;" class="saveFormWizard btn btn-primary"><i class="ace-icon fa fa-check bigger-110"></i>&nbsp;Save</i></button>
+                 <input type="button" disabled="disabled" name="next1" id="next1" class="nextFormWizard btn btn-primary" value="Next"/>
+              </div>
+            </div>
+        </div>
+    </form>
+</div>
+<input type="hidden" id="configWizardValueNewEdit"/>
+<script>
+ //jQuery time
+ $(document).ready(function(e) {
+     orgNameForSetup = $('#orgDropdown option:selected').attr('rowid');
+     orgIdForSetup = $('#orgDropdown option:selected').val();
+     var $option = $('<option></option>').val(orgNameForSetup).attr('rowid', orgIdForSetup).html(orgNameForSetup);
+     $('#orgname').append($option);
+
+
+     //api call for getting the status of wizard
+     var wizardStepsConfig = $('<ol id="configWizard" class="bwizard-steps bwizard-stepsUserConfig clearfix clickable"><li aria-selected="false" style="z-index: 3;" id="teamCreate" class="active btn-2 teamCreate"><span class="label">1</span><a href="ajax/Settings/userManagementWizard.html">Teams</a></li><li aria-selected="false" style="z-index: 3;" id="userCreate" class="btn-3 userCreate"><span class="label">2</span><a href="ajax/Settings/userWizard.html" class="not-activeAnchor hidden-phone">Users</a></li></ol>');
+     $('.wizardFlow').append(wizardStepsConfig);
+     var configWizardStatusValue;
+
+     function configWizardStatus(orgIdForSetup) {
+         $.get('/setting-wizard/org/' + orgIdForSetup, function(data) {
+             if (data.currentStep.name === 'User Configuration') {
+                 if (data.currentStep.nestedSteps) {
+                     var nestedSteps = data.currentStep.nestedSteps;
+                     if (nestedSteps[0].name === 'Team' && nestedSteps[0].isCompleted === true && nestedSteps[1].name === 'User' && nestedSteps[1].isCompleted === false) {
+                         $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
+                         $('.contentSetting').find('ol li#userCreate').addClass('active');
+                         $('.content').load('ajax/Settings/userWizard.html');
+
+
+                     } else {
+                     }
+                 }
+             } else {
+                 getTeamValues();
+                 $('#saveConfigWizard').addClass('hidden');
+                 $('.nextFormWizard').removeAttr('disabled');
+                 $('.btn-3 a').removeClass('not-activeAnchor');
+                 $('.btn-2 a').parent('.bwizard-steps li').addClass('active');
+                 $('.btn-3 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
+             }
+         });
+         $('#wizardActionListLoader').hide();
+     }
+     var configWizardEditValue;
+     orgIdForSetup = selectedDropdownValue || firstOrgValue;
+     if (clicked) {
+         if (orgIdForSetup) {
+             configWizardStatus(orgIdForSetup);
+
+         }
+     } else {
+         //comes when the chefServer is created and navigates back to it.
+
+         if (orgIdForSetup) {
+             $('#wizardActionListLoader').hide();
+             $('.nextFormWizard').removeAttr('disabled');
+             $('.btn-3 a').removeClass('not-activeAnchor');
+             getTeamValues();
+         }
+     }
+ });
+
+  getTemplate = function(val, rowid) {
+             return '<label class="toggle font-sm" style="padding-left:4px;"><input onclick="if($(this).is(&quot;:checked&quot;)) {$(this).closest(&quot;label&quot;).' + 'css(&quot;background-color&quot;,&quot;#eeeeee&quot;);$(this).css(&quot;border-color&quot;,&quot;#3b9ff3&quot;);}else{$(this).closest(&quot;label&quot;).css(&quot;background-color&quot;,&quot;#ffffff&quot;);$(this).css(&quot;border-' + 'color&quot;,&quot;red&quot;);}" type="checkbox" id="checkbox-toggle" name="checkbox-toggle"' + 'value="' + val + '"' + 'rowid="' + rowid + '" style="width:100%"><i data-swchoff-text="NO" data-swchon-text="YES"></i>' + val + '</label>';
+         };
+
+ function getTeamValues() {
+     $.get('/d4dMasters/readmasterjsonnew/21', function(data) {
+         for (var i = 0; i < data.length; i++) {
+             if (selectedDropdownValue === data[i].orgname_rowid[0]) {
+                 var $optionOrgNameEnv = $('<option></option>').val(data[i].orgname[0]).attr('rowid', data[i].orgname_rowid[0]).html(data[i].orgname[0]);
+                 $('#myForm3').find('select#orgname').append($optionOrgNameEnv).attr('disabled', 'disabled');
+                 $('#myForm3').find('input#teamname').val(data[i].teamname).attr('disabled', 'disabled');
+                 $('#myForm3').find('input#description').val(data[i].description).attr('disabled', 'disabled');
+                 $('#myForm3 #loginname').find('input[type="checkbox"][value="'+data[i].loginname+'"]').attr('checked','checked');
+                 $('#myForm3 #projectname').find('input[type="checkbox"][value="'+data[i].projectname+'"]').trigger('click');
+                 //$('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
+                 $('#myForm3').find('button#saveConfigTeam').addClass('hidden');
+                 $('.nextFormWizard').removeAttr('disabled');
+             }
+         }
+     });
+ }
+
+ function getUserValues() {
+     $.get('/d4dMasters/readmasterjsonnew/7', function(data) {
+         for (var i = 0; i < data.length; i++) {
+             if (selectedDropdownValue === data[i].orgname_rowid[0]) {
+                 var $optionOrgNameEnv = $('<option></option>').val(data[i].orgname[0]).attr('rowid', data[i].orgname_rowid[0]).html(data[i].orgname[0]);
+                 $('#myForm5').find('select#orgname').append($optionOrgNameEnv).attr('disabled', 'disabled');
+                 $('#myForm5').find('input#loginname').val(data[i].loginname).attr('disabled', 'disabled');
+                 $('#myForm5').find('input#email').val(data[i].email).attr('disabled', 'disabled');
+                 $('#myForm5').find('div.row1').remove();
+                 $('#myForm5 #userrolename').find('input[type="checkbox"][value="'+data[i].userrolename+'"]').attr('checked','checked');
+                 $('#myForm5 #teamname').find('input[type="checkbox"][value="'+data[i].teamname+'"]').attr('checked','checked');
+                 $('.btn-2 a,.btn-3 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
+                 $('#myForm5').find('button#saveConfigUser').addClass('hidden');
+                 $('.nextFormWizard').removeAttr('disabled');
+             }
+         }
+     });
+ }
+
+ $('.btn-2 a').click(function(e) {
+     e.preventDefault();
+     clicked = false;
+     $('.contentSetting').load(this.getAttribute('href'));
+ });
+ $('.btn-3 a').click(function(e) {
+     e.preventDefault();
+     $('.content').empty();
+     $('.btn-2 a').parent('.bwizard-steps li').removeClass('active');
+     $(this).parent('.bwizard-steps li').addClass('active');
+     $('.content').load(this.getAttribute('href'));
+     getUserValues();
+ });
+
+
+
+ $('#orgname').change(function(e) {
+     $('#projectname').empty();
+     $('#loginname').empty();
+     var str = '';
+         
+     $.get('/d4dMasters/orgs/all/users/7', function(data) {
+         for (var i = 0; i < data.length; i++) {
+             str = '';
+             if (orgIdForSetup === data[i].orgname_rowid[0]) {
+                 str = str + getTemplate(data[i].loginname, data[i].rowid);
+                 $('#loginname').append(str);
+             } else if (data[i].orgname_rowid[0] === "") {
+                 str = str + getTemplate(data[i].loginname, data[i].rowid);
+                 $('#loginname').append(str);
+             }
+         }
+     });
+     $.get('/d4dMasters/readmasterjsonnew/4', function(data) {
+         for (var i = 0; i < data.length; i++) {
+             str = '';
+             if (orgIdForSetup === data[i].orgname_rowid[0]) {
+                 str = str + getTemplate(data[i].projectname, data[i].rowid);
+                 $('#projectname').append(str);
+             }
+         }
+     });
+ });
+ $('#orgname').trigger('change');
+
+ $('#myForm3').submit(function() {
+     $(this).validate();
+
+     if ($(this).valid) {
+         if (!saveform('21'))
+             return false;
+     } else {
+         alert('invalid valid form submitted'); // for demo
+     }
+     return false; // for demo
+ });
+
+ $(".nextFormWizard").click(function() {
+     $('.content').empty();
+     getUserValues();
+     $('.btn-3 a').removeClass('not-activeAnchor');
+     $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
+     $('.contentSetting').find('ol li#teamCreate').addClass('active');
+     $('.content').load('ajax/Settings/userWizard.html');
+ });
+
+</script>
\ No newline at end of file
diff --git a/client/htmls/private/ajax/Settings/userWizard.html b/client/htmls/private/ajax/Settings/userWizard.html
new file mode 100644
index 000000000..0f611e417
--- /dev/null
+++ b/client/htmls/private/ajax/Settings/userWizard.html
@@ -0,0 +1,136 @@
+<div class="content">
+    <form action="" id="myForm5">
+        <div class="widget-box">
+            <div class="widget-header">
+               <h4 class="widget-margin" style="color:black;">Create User
+              </h4>
+            </div>
+            <div class="widget-body">
+                <div class="widget-main" style="min-height:350px">
+                    <div class="jarviswidget" data-widget-editbutton="false" data-widget-custombutton="false">
+                        <div>
+                                    <!-- widget content -->
+                                    <div class="widget-body no-padding">
+                                    <div class="row" style="margin:0px">
+                                       <div class="col-lg-6 col-md-6">
+                                          <label for="name">Login Name:<span class="control-label redSpan">&nbsp;*</span></label>
+                                          
+                                          <input name="ctl00$MainContent$orgname" value="" id="loginname" class="form-control" type="text"  cdata="catalyst" unique="true" cat-validation="required,max15,nospecial" uniqueconditionedby="loginname">
+                                       </div>
+                                       <div class="col-lg-6 col-md-6">
+                                          <label for="">Email Address:<span class="control-label redSpan">&nbsp;*</span></label>
+  
+                                          <input type="text" name="ctl00$MainContent$orgname" value="" id="email" class="form-control" type="email" cdata="catalyst" cat-validation="required,email">
+                                       </div>
+                                       </div>
+                                       
+                                       <div class="row1" style="margin:0px">
+                                       <div class="col-lg-6 col-md-6 editPass" style="margin-top:25px">
+                                          <label for="">Password:<span class="control-label redSpan">&nbsp;*</span>
+                                          </label>
+  
+                                          <input type="password" name="ctl00$MainContent$orgname" id="password" class="form-control" cdata="catalyst" cat-validation="required">
+                                       </div>
+                                       <div class="col-lg-6 col-md-6 editPass" style="margin-top:25px">
+                                          <label for="">Confirm Password:<span class="control-label redSpan">&nbsp;*</span></label>
+  
+                                          <input type="password" name="ctl00$MainContent$orgname" id="cnfPassword" class="form-control" cdata="catalyst" cat-validation="cnfPass" cat-validation="required">
+                                       </div>
+                                       </div>
+                                       <div class="row" style="margin:0px">
+                                       <div class="col-lg-6 col-md-6" style="margin-top:25px">
+                                          <label for="category">Organization:
+                                          </label>
+
+                                          <select id="orgname" class="form-control chooseOrganization width-100" sourcepath="1" datapath="masterjson.rows.row" valuelinkfield="costcode" style="vertical-align:central" cdata="catalyst" linkedfields="['teamname']">
+                                          </select>
+
+                                      </div>
+                                       </div>
+                                       <div class="row" style="margin:0px">
+                                         <div class="col-lg-6 col-md-6 smart-form" style="margin-top:25px">
+                                            <label for="category">Roles:<span class="control-label redSpan">&nbsp;*</span></label>
+                                            <div id="userrolename" multiselect="multiselect" datatype="select" sourcepath="6" datapath="userrolename" class="input-group from-control col-md-12" style="height:150px;overflow-y:auto;padding:2px;border:1px solid silver;width:98%"  cdata="catalyst" cat-validation="onechecked">
+                                            </div>
+                                         </div>
+                                         <div class="col-lg-6 col-md-6 smart-form" style="margin-top:25px;">
+                                            <label for="category">Assign Teams:<span class="control-label redSpan">&nbsp;*</span></label>
+                                             <div class="col-lg-6 smart-form multiselect" style="  height: 153px;overflow-y: scroll;border:1px solid gray;padding: 0px;width:100%">     
+                                              <div id="teamname" multiselect="multiselect" class="input-group from-control col-md-12 widthBox" cdata="catalyst" cat-validation="onechecked" style="width:99%;margin-top:-1px;border:0px;padding-left:5px;" linkedto="orgname">
+                                            </div>
+                                          </div>
+                                          </div>
+                                        </div>
+                                    </div>
+                                    <!-- end widget content -->
+                                 </div>
+                    </div>
+                </div>
+            </div>
+            <div class="widget-toolbox clearfix">
+                <div class="btn-group pull-right">
+                 <button name="next1" id="saveConfigUser" style="margin-right:11px;" class="saveFormWizard btn btn-primary"><i class="ace-icon fa fa-check bigger-110"></i>&nbsp;Save</i></button>
+                 <input type="button" disabled="disabled" name="next1" id="next1" class="nextFormWizard btn btn-primary" value="Next"/>
+              </div>
+            </div>
+        </div>
+    </form>
+</div>
+
+<script>
+ //jQuery time
+ $(document).ready(function(e){
+      orgNameForSetup = $('#orgDropdown option:selected').attr('rowid');
+       orgIdForSetup = $('#orgDropdown option:selected').val();
+       var $option = $('<option></option>').val(orgNameForSetup).attr('rowid', orgIdForSetup).html(orgNameForSetup);
+       $('#orgname').append($option);
+       getUserValues();
+ });
+   $('#orgname').change(function(e){
+        $('#userrolename').empty();
+        $('#teamname').empty();
+        var str;
+        
+       $.get('/d4dMasters/readmasterjsonnew/21',function(data) {
+            for (var i = 0; i<data.length;i++){
+                str = '';
+                if (orgIdForSetup === data[i].orgname_rowid[0]) {
+                   str = str + getTemplate(data[i].teamname, data[i].rowid);
+                   console.log(str);
+                   $('#teamname').append(str);
+               } 
+            }
+       });
+       $.get('/d4dMasters/readmasterjsonnew/6', function(data) {
+           for (var i = 0; i < data.length; i++) {
+               str = '';
+               str = str + getTemplate(data[i].userrolename, data[i].rowid);
+               $('#userrolename').append(str);
+           }
+       });
+   });
+   $('#orgname').trigger('change');
+   enableUniqueCheckingForInputs(7);
+
+   $('#myForm5').submit(function() {      
+       $(this).validate();
+       if($(this).valid){
+           if(validateForm()) {
+            saveform('7');
+          }
+       }else{
+            alert('Invalid values found cannot submit'); // for demo
+       }
+       return false; // for demo
+   });
+
+ $(".nextFormWizard").click(function() {
+       toastr.success('Step 3 - User Configuration Setup Completed');
+       $('#providerConfiguration a').attr('href','ajax/Settings/providerWizard.html');
+       $('#startConfig a, #orgConfiguration a,#configManagement a,#userConfiguration a').addClass('green-btn').removeClass('process-btn');
+       $('.wizardFlow').empty();
+       $('#providerConfiguration a').trigger('click');
+ });
+ 
+
+</script>
\ No newline at end of file
diff --git a/client/htmls/private/css/catalyst.css b/client/htmls/private/css/catalyst.css
index 857d2a915..fb41b673d 100644
--- a/client/htmls/private/css/catalyst.css
+++ b/client/htmls/private/css/catalyst.css
@@ -991,21 +991,25 @@ h6 {
     border: 1px solid rgba(0, 0, 0, .4);
 }
 #left-panel {
-    position: absolute;
-    z-index: 1;
+    position: fixed;
+    z-index: 10;
     width: 254px;
-    display: block;
     background: #2c3638;
     background: -webkit-gradient(linear, left top, right top, color-stop(99%, #2c3638), color-stop(100%, #2c3638));
     background: -webkit-linear-gradient(left, #2c3638 99%, #2c3638 100%);
     background: -webkit-gradient(linear, top left, top right, from(#2c3638), to(#2c3638));
     background: linear-gradient(to right, #2c3638 99%, #2c3638 100%);
-    height: 91.4%!important;
-    float: left;
+    height: 85.1%!important;
+    left: -254px;
+    margin-top: 41px;
+    transition: all .4s ease 0s;
+}
+.show-left-panel {
+    left: 0px !important;
 }
 #main {
     display: block;
-    margin-left: 254px;
+    margin-left: 0px;
     height: 91.6%!important;
 }
 #ribbon {
@@ -1352,13 +1356,10 @@ button {
     }
 }
 @media (min-width: 767px) and (max-width: 979px) {
-    #main {
-        margin-left: 220px;
-    }
     #left-panel {
-        left: 0px;
         position: absolute;
         width: 220px;
+        margin-top: 34px;
     }
     .minified #left-panel {
         left: 0;
@@ -3200,6 +3201,7 @@ header {
 }
 .menu-item-parentdemo li b {
     float: right;
+    display: none;
 }
 nav ul {
     padding: 0;
@@ -3384,7 +3386,7 @@ nav ul {
         min-height: 6%!important;
     }
     #ribbon {
-        min-height: 4%!important;
+        min-height: 8%!important;
     }
     .jarviswidget>div {
         font-size: 12px;
diff --git a/client/htmls/private/css/wizardBg.css b/client/htmls/private/css/wizardBg.css
index 0b81c0ef4..54a39cb7d 100644
--- a/client/htmls/private/css/wizardBg.css
+++ b/client/htmls/private/css/wizardBg.css
@@ -22,7 +22,7 @@ Website: http://www.seantheme.com/color-admin-v2.0/admin/html/
 .bwizard-steps li {
     float: none!important;
     display: table-cell!important;
-    padding: 15px!important;
+   
     line-height: 20px!important;
     background: #d2cbcb;
     -webkit-border-radius: 0!important;
@@ -44,7 +44,8 @@ Website: http://www.seantheme.com/color-admin-v2.0/admin/html/
 
 .bwizard-steps li a {
     margin-left: 30px!important;
-    display: block!important
+    display: block!important;
+    padding: 15px!important;
 }
 
 .bwizard-steps li.active small {
@@ -112,34 +113,8 @@ Website: http://www.seantheme.com/color-admin-v2.0/admin/html/
 .bwizard-steps li:last-child:after {
     border: 0
 }
-
-.bwizard-steps li:before {
-    position: absolute;
-    left: 0;
-    top: 0;
-    height: 0;
-    width: 0;
-    border-bottom: 20px inset transparent;
-    border-left: 20px solid #fff;
-    border-top: 20px inset transparent;
-    content: ""
-}
-
-.bwizard-steps li:after {
-    position: absolute;
-    right: -20px;
-    top: 0;
-    height: 0;
-    width: 0;
-    border-bottom: 20px inset transparent;
-    border-left: 20px solid #efefef;
-    border-top: 20px inset transparent;
-    content: "";
-    z-index: 2
-}
-
 .bwizard-steps .label {
-    margin: 0 5px 0 0;
+    margin: 14px 5px 0 6px;
     padding: 1px 5px 2px;
     position: relative;
     top: -1px
diff --git a/client/htmls/private/img/aws_iogo_inactive.png b/client/htmls/private/img/aws_logo_inactive.png
similarity index 100%
rename from client/htmls/private/img/aws_iogo_inactive.png
rename to client/htmls/private/img/aws_logo_inactive.png
diff --git a/client/htmls/private/index.html b/client/htmls/private/index.html
index 6c17848a7..6844429b9 100644
--- a/client/htmls/private/index.html
+++ b/client/htmls/private/index.html
@@ -88,16 +88,16 @@
       </div>
       <!--for track-->
       <div id="trackShow" style="display:none;">
-        <div class="leftSpaceStyle">
+        <!-- <div class="leftSpaceStyle">
           <div class="hiddencollapse treeStyle">TRACK</div>
-        </div>
+        </div> -->
         <div id="trackTree" class="font-size-12"></div>
       </div>
       <!--track ends here-->
       <div id="Settings_nav" style="display:none;">
-        <div class="leftSpaceStyle">
+        <!-- <div class="leftSpaceStyle">
           <div class="hiddencollapse treeStyle">SETTINGS</div>
-        </div>
+        </div> -->
         <div id="setting_tree" class="font-size-12"></div>
       </div>
       <nav class="font-size-12">
@@ -108,8 +108,6 @@
         </ul>
         <ul class="menu-item-parentdemo hidden" id="blueprints" providerselected="aws">
           <li class="active open">
-            <a href="#" class="activeProviderOpen"><i class="fa fa-lg fa-fw fa-sitemap"></i><span class="menu-item-parent trackAlign"><strong>PROVIDERS</strong></span>
-            </a>
             <ul class="visibleClass">
               <li>
                 <a href="ajax/Aws-Production.html" onclick="$('#blueprints').attr('providerselected','aws');" class="devops_providers">
@@ -135,7 +133,6 @@
           </li>
         </ul>
       </nav>
-      <span class="minifyme"> <i class="fa fa-arrow-circle-left hit"></i> </span>
     </aside>
     <!-- END NAVIGATION -->
     <!-- MAIN PANEL -->
@@ -148,6 +145,14 @@
             <i class="fa fa-sitemap txt-color-lightwhite"></i></a> </span>
           </div>
         </div>
+        <div id="leftPanelToggle" style="cursor: pointer">
+            <div style="float: left; width: 2%; height: 40px; font-size: 20px">
+                <i class="fa fa-bars" style="color: #fff; margin-top: 10px; padding-right: 55px;"></i>
+            </div>
+            <div style="float: left; width: 3%; margin: 11px 0 0 5px; color: #fff; margin-right: 14%; height: 29px;">
+                <span class="menu-item-parent trackAlign"><strong>Menu</strong></span>
+            </div>
+        </div>
         <!-- breadcrumb -->
         <ol class="breadcrumb">
           <!-- This is auto generated -->
@@ -760,6 +765,19 @@ <h4 class="modal-title">
         $('#noenvwarning').addClass('hidden');
         $('#noEnvError').removeClass('hidden');
     }
+
+    $( "#leftPanelToggle" ).mouseover(function() {
+        $("#left-panel").addClass("show-left-panel");
+    });
+    $( "#left-panel" ).mouseover(function() {
+        $("#left-panel").addClass("show-left-panel");
+    });
+    $( "#leftPanelToggle" ).mouseleave(function() {
+        $("#left-panel").removeClass("show-left-panel");
+    });
+    $( "#left-panel" ).mouseleave(function() {
+        $("#left-panel").removeClass("show-left-panel");
+    });
 });
 
 
@@ -953,7 +971,15 @@ <h4 class="modal-title">
             "icon": "fa fa-lg fa-fw fa-tint",
             "parent": "devops",
             "nodetype": "EnvironmentConceptList"
-        }, {
+        }],
+        "borderColor": "#000",
+        "selectable": false,
+        "href": "javascript:void(0);",
+        "icon": "fa-lg fa-fw fa fa-tachometer"
+    }, {
+        "name": "user setup",
+        "text": "User Configuration",
+        "nodes": [{
             "name": "organizations",
             "text": "Teams",
             "borderColor": "#000",
@@ -961,11 +987,27 @@ <h4 class="modal-title">
             "selectable": true,
             "icon": "fa fa-lg fa-fw fa-users"
 
+        }, {
+            "name": "organizations",
+            "text": "User Roles",
+            "borderColor": "#000",
+            "href": "#ajax/Settings/RolesList.html",
+            "selectable": true,
+            "icon": "fa fa-lg fa-fw fa-th-list"
+
+        }, {
+            "name": "organizations",
+            "text": "Users",
+            "borderColor": "#000",
+            "href": "#ajax/Settings/UsersList.html",
+            "selectable": true,
+            "icon": "fa fa-lg fa-fw fa-user"
+
         }],
         "borderColor": "#000",
         "selectable": false,
         "href": "javascript:void(0);",
-        "icon": "fa-lg fa-fw fa fa-tachometer"
+        "icon": "fa fa-lg fa-fw  fa-tasks"
     }, {
         "name": "provider setup",
         "text": "Provider Configuration",
@@ -1064,31 +1106,6 @@ <h4 class="modal-title">
         "selectable": false,
         "href": "javascript:void(0);"
 
-    }, {
-        "name": "usersetup",
-        "text": "Users Setup",
-        "icon": "fa fa-lg fa-fw  fa-tasks",
-        "nodes": [{
-            "name": "organizations",
-            "text": "User Roles",
-            "borderColor": "#000",
-            "href": "#ajax/Settings/RolesList.html",
-            "selectable": true,
-            "icon": "fa fa-lg fa-fw fa-th-list"
-
-        }, {
-            "name": "organizations",
-            "text": "Users",
-            "borderColor": "#000",
-            "href": "#ajax/Settings/UsersList.html",
-            "selectable": true,
-            "icon": "fa fa-lg fa-fw fa-user"
-
-        }],
-        "borderColor": "#000",
-        "selectable": false,
-        "href": "javascript:void(0);"
-
     }, {
         "name": "track",
         "text": "Track Setup",
diff --git a/client/htmls/private/js/blueprintCommon.js b/client/htmls/private/js/blueprintCommon.js
index 2b8ba1a19..7302cc944 100644
--- a/client/htmls/private/js/blueprintCommon.js
+++ b/client/htmls/private/js/blueprintCommon.js
@@ -56,7 +56,7 @@ function getTreeDetails(){
                 $projectList.empty();
                 var getProjs = bgProjects[bgName];
                 for (var i = 0; i < getProjs.length; i++) {
-                    var $option = $('<option></option>').val(getProjs[i].rowid).html(getProjs[i].name);
+                    var $option = $('<option></option>').val(getProjs[i].rowId).html(getProjs[i].name);
                     $projectList.append($option);
                 }
                 $projectList.trigger('change');
@@ -71,7 +71,7 @@ function getTreeDetails(){
                 $projectListforcopy.empty();
                 var getProjs = bgProjects[bgName];
                 for (var i = 0; i < getProjs.length; i++) {
-                    var $option = $('<option></option>').val(getProjs[i].rowid).html(getProjs[i].name);
+                    var $option = $('<option></option>').val(getProjs[i].rowId).html(getProjs[i].name);
                     $projectListforcopy.append($option);
                 }
                 $projectListforcopy.trigger('change');
@@ -174,7 +174,7 @@ function softwareStackListing() {
                 $projectList.empty();
                 var getProjs = bgProjects[bgName];
                 for (var i = 0; i < getProjs.length; i++) {
-                    var $option = $('<option></option>').val(getProjs[i].rowid).html(getProjs[i].name);
+                    var $option = $('<option></option>').val(getProjs[i].rowId).html(getProjs[i].name);
                     $projectList.append($option);
                 }
                 $projectList.trigger('change');
@@ -189,7 +189,7 @@ function softwareStackListing() {
                 $projectListforcopy.empty();
                 var getProjs = bgProjects[bgName];
                 for (var i = 0; i < getProjs.length; i++) {
-                    var $option = $('<option></option>').val(getProjs[i].rowid).html(getProjs[i].name);
+                    var $option = $('<option></option>').val(getProjs[i].rowId).html(getProjs[i].name);
                     $projectListforcopy.append($option);
                 }
                 $projectListforcopy.trigger('change');
diff --git a/client/htmls/public/awsRDSDashboard.html b/client/htmls/public/awsRDSDashboard.html
index 2d21a4328..a5f89623c 100644
--- a/client/htmls/public/awsRDSDashboard.html
+++ b/client/htmls/public/awsRDSDashboard.html
@@ -189,6 +189,7 @@ <h4 class="panel-title padding2">
             <tr>
                 <th class="text-center">Instance</th>
                 <th class="text-center">Org</th>
+                <th class="text-center">Bg</th>
                 <th class="text-center">Project</th>
                 <th class="text-center">Env</th>
                 <th class="text-center">Type</th>
@@ -220,6 +221,7 @@ <h4 class="panel-title padding2">
             <tr>
                 <th class="text-center">Instance</th>
                 <th class="text-center">Org</th>
+                <th class="text-center">Bg</th>
                 <th class="text-center">Project</th>
                 <th class="text-center">Env</th>
                 <th class="text-center">Type</th>
diff --git a/client/htmls/public/awsS3Dashboard.html b/client/htmls/public/awsS3Dashboard.html
index 845910515..311fc0a9c 100644
--- a/client/htmls/public/awsS3Dashboard.html
+++ b/client/htmls/public/awsS3Dashboard.html
@@ -190,7 +190,8 @@ <h4 class="panel-title padding2">
             <tr>
                 <th class="text-center">Bucket Name</th>
                 <th class="text-center">Bucket Owner</th>
-                <th class="text-center">Org Name</th>
+                <th class="text-center">Org</th>
+                <th class="text-center">Bg</th>
                 <th class="text-center">Project</th>
                 <th class="text-center">Env</th>
                 <th class="text-center">Size(MB)</th>
@@ -220,7 +221,8 @@ <h4 class="panel-title padding2">
             <tr>
                 <th class="text-center">Bucket Name</th>
                 <th class="text-center">Bucket Owner</th>
-                <th class="text-center">Org Name</th>
+                <th class="text-center">Org</th>
+                <th class="text-center">Bg</th>
                 <th class="text-center">Project</th>
                 <th class="text-center">Env</th>
                 <th class="text-center">Size(MB)</th>
diff --git a/client/htmls/public/containerLog.html b/client/htmls/public/containerLog.html
new file mode 100644
index 000000000..4c8765407
--- /dev/null
+++ b/client/htmls/public/containerLog.html
@@ -0,0 +1,293 @@
+<html>
+
+<head>
+	<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" rel="stylesheet"> </link>
+	<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css"></link>
+	<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
+	<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>
+	<script type="text/javascript" src="../public/js/pagination.js"></script>
+	<link rel="stylesheet" href="../public/css/auditTrailLogs.css"></link>
+</head>
+
+<body>
+	<div id="containerActionListLoader" style="display: none">
+		<img class="center-block" style="height: 50px; width: 50px; margin-top: 20%; margin-left: 48%;margin-bottom: 10%; position: absolute;" src="img/loading.gif" />
+	</div>
+	<div class="tabContent table-responsive">
+		<h2 class="page-name">Container Audit Trail Logs</h2>
+		<div class="dataTables_filter">
+			<label>Search:&nbsp;
+				<input type="search" id="table_filter_text" class="search" placeholder="">
+				<img src="../private/img/search-icon.png" title="Search" style="margin-left: -26px; cursor: pointer" id="table_filter_text" />
+			</label>
+		</div>
+		<div class="dataTables_length">
+			<label>Show
+				<select id="table_length_sel">
+					<option value="10">10</option>
+					<option value="25">25</option>
+					<option value="50">50</option>
+					<option value="100">100</option>
+				</select> entries
+			</label>
+			<button id="refreshBtn" type="button" title="Refresh" class="btn btn-xs btn-primary refresh-btn" ng-click="refreshCurrentPage()">
+				<i class="fa fa-refresh"></i>
+			</button>
+		</div>
+		<!--Table to show all the container actions for all the containers starts here-->
+		<table class="table table-hover table-bordered text-center" id="containerLogTable">
+			<thead>
+				<tr>
+					<th class="text-center table_sort sorting_desc" data-fieldname='createdOn'>Time
+					</th>
+					<th class="text-center">Container Name</th>
+					<th class="text-center">Container Status</th>
+					<th class="text-center">Host Instance</th>
+					<th class="text-center">Image</th>
+					<th class="text-center">User</th>
+					<th class="text-center">Org</th>
+					<th class="text-center">BU</th>
+					<th class="text-center">Project</th>
+					<th class="text-center">Env</th>
+					<th class="text-center">Action</th>
+					<th class="text-center">Action Status</th>
+					<th class="text-center">Log</th>
+				</tr>
+			</thead>
+			<tbody class="containerLogTrail"></tbody>
+		</table>
+		<div id="green"></div>
+	</div>
+	<!--Modal popup to show the logs for selected container action starts here-->
+	<div class="modal fade" id="containerLogsModalContainer" tabindex="-1" style='z-index:1800' role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="static">
+		<div class="modal-dialog">
+			<div class="modal-content">
+				<div class="modal-header">
+					<button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+					<h4 class="modal-title" id="myModalLabel">
+						<i class="fa fa-bar-chart-o txt-color-blue"></i>&nbsp;&nbsp;Logs
+					</h4>
+				</div>
+				<div class="modal-body">
+					<div class="logsArea"></div>
+				</div>
+				<div class="modal-footer">
+					<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+				</div>
+			</div>
+		</div>
+	</div>
+	<!--Modal popup to show the logs for selected inst.ance action ends here-->
+	<script>
+		$(document).ready(function(e) {
+			var pageSetting = {
+				page: 1,
+				pageSize: 10,
+				sortBy: "createdOn",
+				sortOrder: "desc",
+				search: ""
+			};
+
+			var containerLogsHandler = function(e) {
+				var containerActionId = $(this).attr('data-id');
+				var timeout;
+				var $containerLogModalContainer = $('#containerLogsModalContainer');
+				$containerLogModalContainer.on('hidden.bs.modal', function(e) {
+					$containerLogModalContainer.off('hidden.bs.modal');
+					if (timeout) {
+						clearTimeout(timeout);
+					}
+				});
+				$containerLogModalContainer.find('.logsArea').empty().append('<img class="center-block" style="height:50px;width:50px;margin-top: 10%;margin-bottom: 10%;" src="img/loading.gif" />');
+				$containerLogModalContainer.modal('show');
+				var lastTimestamp;
+				//Showing the log for containers
+				function pollLogs(timestamp, delay, clearData) {
+					var url = '/audit-trail/container-action/' + containerActionId+'/logs';
+					url = url + '?timestamp=' + timestamp;
+					timeout = setTimeout(function() {
+						$.ajax({
+						  url: url,
+						  cache: false
+						}).done(function(data) {
+							var $modalBody = $containerLogModalContainer.find('.logsArea')
+							if (clearData) {
+								$modalBody.empty();
+							}
+							var $table = $('<table></table>');
+							var logsLength = 0;
+							if (data.length > 300) {
+								logsLength = 300;
+							} else {
+								logsLength = data.length;
+							}
+							for (var i = 0; i < logsLength; i++) {
+								var $rowDiv = $('<tr class="row rowSpacing"></tr>');
+								var timeString = new Date().setTime(data[i].timestamp);
+								var date = new Date(timeString).toLocaleString();
+								var logStr =data[i].log;
+								if (data[i].err) {
+									$rowDiv.append($('<td class="col-lg-12 col-sm-12" style="color:red;"></td>').append('<span class="textLogs">' + date + '</span>' + '&nbsp;&nbsp;&nbsp;' + '<span>' + logStr + '</span>'));
+								} else {
+									$rowDiv.append($('<td class="col-lg-12 col-sm-12" style="color:DarkBlue;"></td>').append('<span class="textLogs">' + date + '</span>' + '&nbsp;&nbsp;&nbsp;' + '<span>' + logStr + '</span>'));
+								}
+								$table.append($rowDiv);
+								lastTimestamp = data[i].timestamp;
+								$modalBody.append($table);
+								$modalBody.scrollTop($modalBody[0].scrollHeight + 100);
+							}
+							if ($containerLogModalContainer.data()['bs.modal'].isShown) {
+								pollLogs(lastTimestamp, 5000, false);
+							} else {
+								console.log('not polling again');
+							}
+						});
+					}, delay);
+				}
+				pollLogs(0, 0, true);
+			};
+
+			function getcontainers() {
+				$('#containerActionListLoader').show();
+				var url = '/audit-trail/container-action?page=' + pageSetting.page + '&pageSize=' + pageSetting.pageSize + '&sortBy=' + pageSetting.sortBy + '&sortOrder=' + pageSetting.sortOrder;
+				if (pageSetting.search != '') {
+					url += '&search=' + pageSetting.search;
+				}
+				$.get(url, function(containers) {
+					$('#containerActionListLoader').hide();
+					createcontainerLogTable(containers.containerLogs);
+					$('#green').smartpaginator({
+						totalrecords: containers.metaData.totalRecords,
+						recordsperpage: pageSetting.pageSize,
+						initval: pageSetting.page,
+						controlsalways: true,
+						length: 5,
+						onchange: function(newPage) {
+							pageSetting.page = newPage;
+							getcontainers();
+						}
+					});
+				}).fail(function(jxhr) {
+					$('#containerActionListLoader').show();
+					var msg = "Unable to fetch containers";
+					if (jxhr.responseJSON && jxhr.responseJSON.message) {
+						msg = jxhr.responseJSON.message;
+					} else if (jxhr.responseText) {
+						msg = jxhr.responseText;
+					}
+					bootbox.alert(msg);
+				});
+			}
+			getcontainers();
+
+			$("#refreshBtn").click(function() {
+				pageSetting.sortBy = "createdOn";
+				pageSetting.sortOrder = "desc";
+				pageSetting.search = "";
+				$('#table_filter_text').val('');
+				getcontainers();
+			});
+
+			$("#table_length_sel").change(function() {
+				pageSetting.pageSize = $(this).val();
+				getcontainers();
+			});
+
+			$("#table_filter_text").change(function() {
+				pageSetting.search = $(this).val();
+				getcontainers();
+			});
+
+			$(".table_sort").click(function() {
+				$(".sorting_desc").removeClass('sorting_desc');
+				$(".sorting_asc").removeClass('sorting_asc');
+				var sortBy = $(this).data('fieldname');
+				if (pageSetting.sortBy == sortBy) {
+					pageSetting.sortOrder = (pageSetting.sortOrder == 'desc') ? 'asc' : 'desc';
+				}
+				pageSetting.sortBy = sortBy;
+				$(this).addClass('sorting_' + pageSetting.sortOrder);
+				getcontainers();
+			});
+
+			function createcontainerLogTable(containerData) {
+				var managedData = containerData;
+				var $tbody = $('#containerLogTable tbody').empty();
+				if(managedData.length == 0) {
+					var $tbody = $('.containerLogTrail').append('<tr><td colspan="15"><span>No data available in table</span></td></tr>');
+				}
+				var $providerImg = '';
+				var $osImg = '';
+				for (var i = 0; i < managedData.length; i++) {
+					var containerId = "";
+					var $tr = $('<tr class="containerLogTrail"></tr>').attr('data-id', containerId);
+					var createdOn = new Date(managedData[i].createdOn).toLocaleString();
+					var $tdCreatedOn = $('<td></td>').append(createdOn);
+					$tr.append($tdCreatedOn);
+					var $tdcontainerName = $('<td></td>').append(managedData[i].containerName);
+					$tr.append($tdcontainerName);
+					var containerStatus = managedData[i].status;
+					switch (containerStatus) {
+		                case "Start":
+		                    $tdStatus = $("<img title='Start' class ='statusIcon' src = '../private/img/aws_logo_started.png' alt='statusType'/>");
+		                    break;
+		                case "Unpause":
+		                    $tdStatus = $("<img title='Unpause' class ='statusIcon' src = '../private/img/aws_logo_started.png' alt='statusType'/>");
+		                    break;
+		                case "Restart":
+		                    $tdStatus = $("<img title='Restart' class ='statusIcon' src = '../private/img/aws_logo_started.png' alt='statusType'/>");
+		                    break;
+		                case "Stop":
+		                    $tdStatus = $("<img title='Stopped' class ='statusIcon' src = '../private/img/aws_logo_stopped.png' alt='statusType'/>");
+		                    break;
+		                case "Pause":
+		                    $tdStatus = $("<img title='Pause' class ='statusIcon' src = '../private/img/aws_logo_inactive.png' alt='statusType'/>");
+		                    break;
+						case "Terminated":
+							$tdStatus = $("<img title='Terminated' class ='statusIcon' src = '../private/img/aws_logo_stopped.png' alt='statusType'/>");
+							break;
+		                default:
+		                    $tdStatus = $("<img title='Start' class ='statusIcon' src = '../private/img/aws_logo_started.png' alt='statusType'/>");
+		                    break;
+		            }
+					var $tdStatus = $('<td></td>').append($tdStatus);
+					$tr.append($tdStatus);
+					var $tdinstanceName = $('<td></td>').append(managedData[i].instanceIP);
+					$tr.append($tdinstanceName);
+					var $tdImage = $('<td></td>').append(managedData[i].Image);
+					$tr.append($tdImage);
+					var $tdUser = $('<td></td>').append(managedData[i].user);
+					$tr.append($tdUser);
+					var $tdOrg = $('<td></td>').append(managedData[i].orgName);
+					$tr.append($tdOrg);
+					var $tdBG = $('<td></td>').append(managedData[i].bgName);
+					$tr.append($tdBG);
+					var $projectName = $('<td></td>').append(managedData[i].projectName);
+					$tr.append($projectName);
+					var $environmentName = $('<td></td>').append(managedData[i].envName);
+					$tr.append($environmentName);
+					var $tdAction = $('<td></td>').append(managedData[i].action);
+					$tr.append($tdAction);
+					if (managedData[i].actionStatus == 'success') {
+						$tdActionStatus = $("<img title='success' class ='statusIcon' src = '../private/img/aws_logo_started.png' alt='statusType'/>");
+					}else if (managedData[i].actionStatus == 'pending' || managedData[i].actionStatus == 'waiting') {
+						$tdActionStatus = $("<img title='pending' class ='statusIcon' src = '../private/img/aws_logo_paused.png' alt='statusType'/>");
+					}else if (managedData[i].actionStatus == 'failed') {
+						$tdActionStatus = $("<img title='failed' class ='statusIcon' src = '../private/img/aws_logo_stopped.png' alt='statusType'/>");
+					}else {
+						$tdActionStatus = $("<img title='failed' class ='statusIcon' src = '../private/img/aws_logo_stopped.png' alt='statusType'/>");
+					}
+					var $tdActionStatus = $('<td></td>').append($tdActionStatus);
+					$tr.append($tdActionStatus);
+					var $logIcon = $("<a data-original-title='MoreInfo' class='moreInfoLog' data-placement='top' rel='tooltip' href='javascript:void(0)' data-toggle='modal' data-id=" + managedData[i].actionId + "><img class='moreInfo' src = '../private/img/galleryIcons/moreinfo.png' alt='moreInfo'/></a>");
+					var $tdLog = $('<td></td>').append($logIcon);
+					$tr.append($tdLog);
+					$logIcon.click(containerLogsHandler);
+					$tbody.append($tr);
+				}
+			}
+		});
+	</script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/client/htmls/public/css/auditTrailLogs.css b/client/htmls/public/css/auditTrailLogs.css
index 7e6711e95..35621fd3c 100755
--- a/client/htmls/public/css/auditTrailLogs.css
+++ b/client/htmls/public/css/auditTrailLogs.css
@@ -184,7 +184,7 @@ table {
 	background-image: url("/private/img/sort_desc.png");
 }
 
-#instanceActionListLoader, #taskActionListLoader {
+#instanceActionListLoader, #taskActionListLoader, #containerActionListLoader {
 	opacity: 0.6;
     height: 100%;
     width: 100%;
diff --git a/client/htmls/public/instanceLog.html b/client/htmls/public/instanceLog.html
index 4f13795fe..7db5232ca 100644
--- a/client/htmls/public/instanceLog.html
+++ b/client/htmls/public/instanceLog.html
@@ -52,7 +52,7 @@ <h2 class="page-name">Instance Audit Trail Logs</h2>
 					<th class="text-center">Env</th>
 					<th class="text-center">Blueprint</th>
 					<th class="text-center">Action</th>
-					<th class="text-center">ActionStatus</th>
+					<th class="text-center">Action Status</th>
 					<th class="text-center">Log</th>
 				</tr>
 			</thead>
@@ -183,8 +183,6 @@ <h4 class="modal-title" id="myModalLabel">
 			getInstances();
 
 			$("#refreshBtn").click(function() {
-				pageSetting.page = 1;
-				pageSetting.pageSize = 10;
 				pageSetting.sortBy = "createdOn";
 				pageSetting.sortOrder = "desc";
 				pageSetting.search = "";
diff --git a/client/htmls/public/js/awsRDSDashboard.js b/client/htmls/public/js/awsRDSDashboard.js
index ec4a00f1a..9532455d2 100644
--- a/client/htmls/public/js/awsRDSDashboard.js
+++ b/client/htmls/public/js/awsRDSDashboard.js
@@ -154,9 +154,42 @@ $(document).ready(function() {
         "ajax": '/resources?filterBy=providerId:'+ providerId +'+resourceType:RDS+category:assigned',
         "columns": [
             {"data": "resourceDetails.dbName",  "orderable" : true},
-            {"data": "masterDetails.orgName","orderable" : false  },
-            {"data": "masterDetails.projectName","orderable" : false  },
-            {"data": "masterDetails.envName","orderable" : false  },
+            {"data": "masterDetails.orgName","orderable" : false,
+                "render": function (data) {
+                    if(data !== null){
+                        return data;
+                    }else{
+                        return '-';
+                    }
+                }
+            },
+            {"data": "masterDetails.bgName","orderable" : false,
+                "render": function (data) {
+                    if(data !== null){
+                        return data;
+                    }else{
+                        return '-';
+                    }
+                }
+            },
+            {"data": "masterDetails.projectName","orderable" : false,
+                "render": function (data) {
+                    if(data !== null){
+                        return data;
+                    }else{
+                        return '-';
+                    }
+                }
+            },
+            {"data": "masterDetails.envName","orderable" : false,
+                "render": function (data) {
+                    if(data !== null){
+                        return data;
+                    }else{
+                        return '-';
+                    }
+                }
+            },
             {"data": "resourceDetails.dbEngine","orderable" : true  },
             {"data": "resourceDetails.dbInstanceStatus","orderable" : true  },
             {"data": "resourceDetails.region","orderable" : false  },
@@ -178,9 +211,42 @@ $(document).ready(function() {
             "ajax": '/resources?filterBy=resourceType:RDS+category:assigned',
             "columns": [
                 {"data": "resourceDetails.dbName",  "orderable" : true},
-                {"data": "masterDetails.orgName","orderable" : false  },
-                {"data": "masterDetails.projectName","orderable" : false  },
-                {"data": "masterDetails.envName","orderable" : false  },
+                {"data": "masterDetails.orgName","orderable" : false,
+                    "render": function (data) {
+                        if(data !== null){
+                            return data;
+                        }else{
+                            return '-';
+                        }
+                    }
+                },
+                {"data": "masterDetails.bgName","orderable" : false,
+                    "render": function (data) {
+                        if(data !== null){
+                            return data;
+                        }else{
+                            return '-';
+                        }
+                    }
+                },
+                {"data": "masterDetails.projectName","orderable" : false,
+                    "render": function (data) {
+                        if(data !== null){
+                            return data;
+                        }else{
+                            return '-';
+                        }
+                    }
+                },
+                {"data": "masterDetails.envName","orderable" : false,
+                    "render": function (data) {
+                        if(data !== null){
+                            return data;
+                        }else{
+                            return '-';
+                        }
+                    }
+                },
                 {"data": "resourceDetails.dbEngine","orderable" : true  },
                 {"data": "resourceDetails.dbInstanceStatus","orderable" : true  },
                 {"data": "resourceDetails.region","orderable" : false  },
diff --git a/client/htmls/public/js/awsS3Dashboard.js b/client/htmls/public/js/awsS3Dashboard.js
index 746e27a83..edeb39d5c 100644
--- a/client/htmls/public/js/awsS3Dashboard.js
+++ b/client/htmls/public/js/awsS3Dashboard.js
@@ -153,9 +153,42 @@ $(document).ready(function() {
         "columns": [
             {"data": "resourceDetails.bucketName", "orderable" : true},
             {"data": "resourceDetails.bucketOwnerName" ,"orderable" : false },
-            {"data": "masterDetails.orgName","orderable" : false  },
-            {"data": "masterDetails.projectName" ,"orderable" : false },
-            {"data": "masterDetails.envName" ,"orderable" : false },
+            {"data": "masterDetails.orgName","orderable" : false,
+                "render": function (data) {
+                    if(data !== null){
+                        return data;
+                    }else{
+                        return '-';
+                    }
+                }
+            },
+            {"data": "masterDetails.bgName","orderable" : false,
+                "render": function (data) {
+                    if(data !== null){
+                        return data;
+                    }else{
+                        return '-';
+                    }
+                }
+            },
+            {"data": "masterDetails.projectName" ,"orderable" : false,
+                "render": function (data) {
+                    if(data !== null){
+                        return data;
+                    }else{
+                        return '-';
+                    }
+                }
+            },
+            {"data": "masterDetails.envName" ,"orderable" : false,
+                "render": function (data) {
+                    if(data !== null){
+                        return data;
+                    }else{
+                        return '-';
+                    }
+                }
+            },
             {"data": "resourceDetails.bucketSize","orderable" : true  },
             {"data": "resourceDetails.bucketCreatedOn","orderable" : true,
                 "render": function (data) {
@@ -177,9 +210,42 @@ $(document).ready(function() {
             "columns": [
                 {"data": "resourceDetails.bucketName", "orderable" : true},
                 {"data": "resourceDetails.bucketOwnerName" ,"orderable" : false },
-                {"data": "masterDetails.orgName","orderable" : false  },
-                {"data": "masterDetails.projectName" ,"orderable" : false },
-                {"data": "masterDetails.envName" ,"orderable" : false },
+                {"data": "masterDetails.orgName","orderable" : false,
+                    "render": function (data) {
+                        if(data !== null){
+                            return data;
+                        }else{
+                            return '-';
+                        }
+                    }
+                },
+                {"data": "masterDetails.bgName","orderable" : false,
+                    "render": function (data) {
+                        if(data !== null){
+                            return data;
+                        }else{
+                            return '-';
+                        }
+                    }
+                },
+                {"data": "masterDetails.projectName" ,"orderable" : false,
+                    "render": function (data) {
+                        if(data !== null){
+                            return data;
+                        }else{
+                            return '-';
+                        }
+                    }
+                },
+                {"data": "masterDetails.envName" ,"orderable" : false,
+                    "render": function (data) {
+                        if(data !== null){
+                            return data;
+                        }else{
+                            return '-';
+                        }
+                    }
+                },
                 {"data": "resourceDetails.bucketSize","orderable" : true  },
                 {"data": "resourceDetails.bucketCreatedOn","orderable" : true,
                     "render": function (data) {
diff --git a/seed/mongodump/devops_new/settingwizards.bson b/seed/mongodump/devops_new/settingwizards.bson
index b932fa035..643452fbb 100644
Binary files a/seed/mongodump/devops_new/settingwizards.bson and b/seed/mongodump/devops_new/settingwizards.bson differ
diff --git a/seed/mongodump/devops_new/tracks.bson b/seed/mongodump/devops_new/tracks.bson
index e52c2e2fa..f88629cc9 100644
Binary files a/seed/mongodump/devops_new/tracks.bson and b/seed/mongodump/devops_new/tracks.bson differ
diff --git a/server/app/cronjobs/docker-container-sync/DockerContainerSync.js b/server/app/cronjobs/docker-container-sync/DockerContainerSync.js
index 04fceb8fb..fba3e626a 100644
--- a/server/app/cronjobs/docker-container-sync/DockerContainerSync.js
+++ b/server/app/cronjobs/docker-container-sync/DockerContainerSync.js
@@ -5,10 +5,12 @@ var MasterUtils = require('_pr/lib/utils/masterUtil.js');
 var credentialCrpto = require('_pr/lib/credentialcryptography.js');
 var instancesDao = require('_pr/model/classes/instance/instance');
 var containerDao = require('_pr/model/container');
+var containerLogModel = require('_pr/model/log-trail/containerLog.js');
 var SSH = require('_pr/lib/utils/sshexec');
 var fileIo = require('_pr/lib/utils/fileio');
 var toPairs = require('lodash.topairs');
 var async = require('async');
+var logsDao = require('_pr/model/dao/logsdao.js');
 
 var DockerContainerSync = Object.create(CatalystCronJob);
 DockerContainerSync.interval = '*/2 * * * *';
@@ -57,7 +59,7 @@ function dockerContainerSync() {
 function aggregateDockerContainerForInstance(instance){
     logger.info("Docker Container Sync started for Instance IP "+instance.instanceIP);
     if(instance.instanceState === 'terminated' || instance.instanceState === 'stopped'){
-        deleteContainerByInstanceId(instance._id,function(err,data){
+        deleteContainerByInstanceId(instance,function(err,data){
             if(err){
                 logger.error(err);
                 return;
@@ -203,7 +205,7 @@ function aggregateDockerContainerForInstance(instance){
                 if(containers.operation === 'delete'){
                     deleteContainerByInstanceId(containers.instanceId,next);
                 }else if (containers.operation === 'create'){
-                    saveAndUpdateContainers(containers.containers,containers.containerIds,containers.instanceId,next)
+                    saveAndUpdateContainers(containers.containers,containers.containerIds,containers.instanceId,instance,next)
                 }else{
                     next(null,containers);
                 }
@@ -220,7 +222,7 @@ function aggregateDockerContainerForInstance(instance){
     }
 };
 
-function saveAndUpdateContainers(containers,containerIds,instanceId,next){
+function saveAndUpdateContainers(containers,containerIds,instanceId,instance,next){
     async.waterfall([
             function(next){
                 containerDao.deleteContainersByContainerIds(instanceId,containerIds,next);
@@ -238,9 +240,74 @@ function saveAndUpdateContainers(containers,containerIds,instanceId,next){
                                     if(err){
                                         logger.error(err);
                                         return;
+
                                     }else{
                                         count++;
+                                        var containerStatus = container.Status;
+                                        var actionObj = '',action ='',logs = '',actionId;
+                                        if(containerStatus.indexOf('Paused') === -1){
+                                            actionObj = 'Container-'+container.Names+'-Pause';
+                                            action = 'Pause';
+                                            actionId = 4;
+                                            logs = "Docker-Container "+container.Names+" Paused";
+                                        }else if(containerStatus.indexOf('Exited') === -1){
+                                            actionObj = 'Container-'+container.Names+'-Stop';
+                                            action = 'Stop';
+                                            actionId = 2;
+                                            logs = "Docker-Container "+container.Names+" Stopped";
+                                        }else if(containerStatus.indexOf('Up') === -1){
+                                            actionObj = 'Container-'+container.Names+'-Start';
+                                            action = 'Start';
+                                            logs = "Docker-Container "+container.Names+" Started";
+                                        }
+                                        var actionObj = 'Container-'+container.Names+'-Start';
+                                        var timestampStarted = new Date().getTime();
+                                        var actionLog = instancesDao.insertDockerActionLog(instanceId, instance.catUser, actionObj, actionId, timestampStarted);
+                                        var logReferenceIds = [instance._id, actionLog._id];
+                                        logsDao.insertLog({
+                                            referenceId: logReferenceIds,
+                                            err: false,
+                                            log: logs,
+                                            timestamp: timestampStarted
+                                        });
+
 
+                                        var containerLogs ={
+                                            actionId: actionLog._id,
+                                            containerId: container.Id,
+                                            orgName: instance.orgName,
+                                            orgId: instance.orgId,
+                                            bgName: instance.bgName,
+                                            bgId: instance.bgId,
+                                            projectName: instance.projectName,
+                                            envName: instance.environmentName,
+                                            envId: instance.envId,
+                                            status: action,
+                                            actionStatus: "success",
+                                            instanceIP:instance.instanceIP,
+                                            platformId: instance.platformId,
+                                            containerName: container.Names,
+                                            Image: container.Image,
+                                            ImageID: container.ImageID,
+                                            platform: instance.hardware.platform,
+                                            os: instance.hardware.os,
+                                            user: instance.catUser,
+                                            createdOn: new Date().getTime(),
+                                            startedOn: new Date().getTime(),
+                                            providerType: instance.providerType ? instance.providerType:null,
+                                            action: action,
+                                            logs: [{
+                                                err: false,
+                                                log: "Started container",
+                                                timestamp: new Date().getTime()
+                                            }]
+                                        };
+                                        containerLogModel.createOrUpdate(containerLogs, function(err, logData){
+                                            if (err) {
+                                            logger.error("Failed to create or update containerLog: ", err);
+                                            }
+                                        });
+                                        instancesDao.updateActionLog(instance._id, actionLog._id, true, new Date().getTime());
                                         if(count === containers.length){
                                             next(null,containers);
                                         }
@@ -284,11 +351,76 @@ function dockerContainerStatus(status){
     }
 };
 
-function deleteContainerByInstanceId(instanceId,next){
+function deleteContainerByInstanceId(instanceDetails,next){
+    var containerList = [];
+    var count = 0;
     async.waterfall([
             function(next){
-                containerDao.deleteContainerByInstanceId(instanceId,next);
-            }],
+                containerDao.getContainerByInstanceId(instanceDetails._id,next);
+            },
+            function(containers,next){
+                containerList = containers;
+                containerDao.deleteContainerByInstanceId(instanceDetails._id,next);
+            },
+        function(containers,next){
+                if(containerList.length > 0){
+                    for(var i = 0; i < containerList.length;i++){
+                        (function(container){
+                            var timestampStarted = new Date().getTime();
+                            var actionObj = 'Container-'+container.Names+'-Terminated';
+                            var actionLog = instancesDao.insertDockerActionLog(instanceDetails._id,instanceDetails.catUser , actionObj, 6, timestampStarted);
+                            var logReferenceIds = [instanceDetails._id, actionLog._id];
+                            logsDao.insertLog({
+                                referenceId: logReferenceIds,
+                                err: false,
+                                log: "Docker-Container "+container.Names+" Terminated",
+                                timestamp: timestampStarted
+                            });
+
+                            var containerLog ={
+                                actionId: actionLog._id,
+                                containerId: container.Id,
+                                orgName: instanceDetails.orgName,
+                                orgId: instanceDetails.orgId,
+                                bgName: instanceDetails.bgName,
+                                bgId: instanceDetails.bgId,
+                                projectName: instanceDetails.projectName,
+                                envName: instanceDetails.environmentName,
+                                envId: instanceDetails.envId,
+                                status: 'Terminated',
+                                actionStatus: "success",
+                                instanceIP:instanceDetails.instanceIP,
+                                platformId: instanceDetails.platformId,
+                                containerName: container.Names,
+                                Image: container.Image,
+                                ImageID: container.ImageID,
+                                platform: instanceDetails.hardware.platform,
+                                os: instanceDetails.hardware.os,
+                                user: instanceDetails.catUser,
+                                createdOn: new Date().getTime(),
+                                startedOn: new Date().getTime(),
+                                providerType: instanceDetails.providerType ? instanceDetails.providerType:null,
+                                action: 'Terminated',
+                                logs: []
+                            };
+
+                            containerLogModel.createOrUpdate(containerLog, function(err, logData){
+                                if (err) {
+                                    logger.error("Failed to create or update containerLog: ", err);
+                                }
+                                count++;
+                            });
+                            instancesDao.updateActionLog(instanceDetails._id, actionLog._id, true, new Date().getTime());
+                            if(count === containers.length){
+                                next(null,containers);
+                            }
+                        })(containerList[i]);
+                    }
+                }else{
+                    next(null,containerList);
+                }
+        }
+        ],
         function (err, results) {
             if(err){
                 logger.error("Error in deleteContainerByInstanceId ");
diff --git a/server/app/cronjobs/provider-rds-s3-sync/AWSRDSS3ProviderSync.js b/server/app/cronjobs/provider-rds-s3-sync/AWSRDSS3ProviderSync.js
index 65ae33759..2e7ffda58 100644
--- a/server/app/cronjobs/provider-rds-s3-sync/AWSRDSS3ProviderSync.js
+++ b/server/app/cronjobs/provider-rds-s3-sync/AWSRDSS3ProviderSync.js
@@ -80,10 +80,10 @@ function awsRDSS3ProviderSyncForProvider(provider,orgName) {
                     saveRDSData(resources.rds, callback);
                 },
                 s3Delete: function (callback) {
-                    deleteResourceData(resources.s3, provider._id, 'S3', callback);
+                    deleteS3ResourceData(resources.s3, provider._id, callback);
                 },
                 rdsDelete: function (callback) {
-                    deleteResourceData(resources.rds, provider._id, 'RDS', callback);
+                    deleteRDSResourceData(resources.rds, provider._id, callback);
                 }
             }, function (err, results) {
                 if (err) {
@@ -111,172 +111,215 @@ function awsRDSS3ProviderSyncForProvider(provider,orgName) {
 };
 function saveS3Data(s3Info, callback) {
     var results = [];
-    if(s3Info.length == 0)
+    if(s3Info.length === 0) {
         return callback(null, results);
-    for(var i = 0; i < s3Info.length; i++) {
-        (function(s3) {
-            s3Model.getS3BucketData(s3,function(err,responseBucketData){
-                if(err) {
-                    callback(err,null);
-                }
-                if(responseBucketData.length === 0){
-                    s3Model.createNew(s3,function(err, bucketSavedData) {
-                        if(err) {
-                            callback(err,null);
-                        } else {
-                            results.push(bucketSavedData);
-                        }
-                        if(results.length === s3Info.length) {
-                            callback(null, results);
-                        }
-                    });
-                }else{
-                    s3Model.updateS3BucketData(s3,function(err, bucketUpdatedData) {
-                        if(err) {
-                            callback(err,null);
-                        } else {
-                            results.push(bucketUpdatedData);
-                        }
-                        if(results.length === s3Info.length) {
-                            callback(null, results);
-                        }
-                    });
-                }
-            })
-        })(s3Info[i]);
-    };
-};
+    }else {
+        for (var i = 0; i < s3Info.length; i++) {
+            (function (s3) {
+                s3Model.getS3BucketData(s3, function (err, responseBucketData) {
+                    if (err) {
+                        callback(err, null);
+                    }
+                    if (responseBucketData.length === 0) {
+                        s3Model.createNew(s3, function (err, bucketSavedData) {
+                            if (err) {
+                                callback(err, null);
+                            } else {
+                                results.push(bucketSavedData);
+                            }
+                            if (results.length === s3Info.length) {
+                                callback(null, results);
+                            }
+                        });
+                    } else {
+                        s3Model.updateS3BucketData(s3, function (err, bucketUpdatedData) {
+                            if (err) {
+                                callback(err, null);
+                            } else {
+                                results.push(bucketUpdatedData);
+                            }
+                            if (results.length === s3Info.length) {
+                                callback(null, results);
+                            }
+                        });
+                    }
+                })
+            })(s3Info[i]);
+        }
+    }
+}
 
 function saveRDSData(rdsInfo, callback) {
     var results = [];
-    if(rdsInfo.length == 0)
+    if(rdsInfo.length === 0) {
         return callback(null, results);
-    for(var i = 0; i < rdsInfo.length; i++) {
-        (function(rds) {
-            rdsModel.getRDSData(rds,function(err,responseRDSData){
-                if(err) {
-                    callback(err,null);
-                }
-                if(responseRDSData.length === 0){
-                    rdsModel.createNew(rds,function(err, rdsSavedData) {
-                        if(err) {
-                            callback(err,null);
-                        } else {
-                            results.push(rdsSavedData);
-                        }
-                        if(results.length === rdsInfo.length) {
-                            callback(null, results);
-                        }
-                    });
-                }else{
-                    rdsModel.updateRDSData(rds,function(err, rdsUpdatedData) {
-                        if(err) {
-                            callback(err,null);
-                        } else {
-                            results.push(rdsUpdatedData);
-                        }
-                        if(results.length === rdsInfo.length) {
-                            callback(null, results);
-                        }
-                    });
-                }
-            })
-        })(rdsInfo[i]);
-    };
+    }else {
+        for (var i = 0; i < rdsInfo.length; i++) {
+            (function (rds) {
+                rdsModel.getRDSData(rds, function (err, responseRDSData) {
+                    if (err) {
+                        callback(err, null);
+                    }
+                    if (responseRDSData.length === 0) {
+                        rdsModel.createNew(rds, function (err, rdsSavedData) {
+                            if (err) {
+                                callback(err, null);
+                                return;
+                            } else {
+                                results.push(rdsSavedData);
+                            }
+                            if (results.length === rdsInfo.length) {
+                                callback(null, results);
+                                return;
+                            }
+                        });
+                    } else {
+                        rdsModel.updateRDSData(rds, function (err, rdsUpdatedData) {
+                            if (err) {
+                                callback(err, null);
+                                return;
+                            } else {
+                                results.push(rdsUpdatedData);
+                            }
+                            if (results.length === rdsInfo.length) {
+                                callback(null, results);
+                                return;
+                            }
+                        });
+                    }
+                })
+            })(rdsInfo[i]);
+        }
+    }
 }
 
-function deleteResourceData(resourceInfo,providerId,resourceType, callback) {
-    var results = [];
-    if(resourceInfo.length === 0){
-        resourceModel.deleteResourcesByResourceType(resourceType,function(err,data){
-            if(err){
+function deleteS3ResourceData(s3Info,providerId, callback) {
+    if(s3Info.length === 0){
+        resourceModel.deleteResourcesByResourceType('S3', function (err, data) {
+            if (err) {
                 callback(err,null);
-            }else{
-                callback(null,data);
+                return;
+            } else {
+                callback(null,s3Info);
+                return;
             }
-        })
-    }else if(resourceType === 'S3'){
-        resourceModel.getResourcesByProviderResourceType(providerId,resourceType,function(err,s3data){
-            if(err){
-                callback(err,null);
-            }else {
-                var count = 0;
-                if (s3data.length === 0) {
-                    callback(null,[]);
-                } else {
-                    for (var i = 0; i < s3data.length; i++) {
+        });
+    }else {
+        async.waterfall([
+            function (next) {
+                bucketNameList(s3Info, next);
+            },
+            function (bucketNames, next) {
+                resourceModel.getResourcesByProviderResourceType(providerId, 'S3', function (err, s3data) {
+                    if (err) {
+                        next(err);
+                    } else {
+                        next(null, s3data, bucketNames);
+                    }
+                });
+            },
+            function (s3Data, bucketNames, next) {
+                if (s3Data.length > 0) {
+                    var count = 0;
+                    for (var i = 0; i < s3Data.length; i++) {
                         (function (s3) {
-                            for (var j = 0; j < resourceInfo.length; j++) {
-                                (function (resource) {
-                                    if (s3.resourceDetails.bucketName === resource.resourceDetails.bucketName) {
+                            if (bucketNames.indexOf(s3.resourceDetails.bucketName) === -1) {
+                                resourceModel.deleteResourcesById(s3._id, function (err, data) {
+                                    if (err) {
+                                        next(err);
+                                    } else {
                                         count++;
-                                        if (count === resourceInfo.length) {
-                                            callback(null, []);
+                                        if (count === s3Data.length) {
+                                            next(null, data);
                                         }
-                                    } else {
-                                        resourceModel.deleteResourcesById(s3._id, function (err, data) {
-                                            if (err) {
-                                                callback(err, null);
-                                            } else {
-                                                count++;
-                                                if (count === resourceInfo.length) {
-                                                    callback(null, data);
-                                                }
-                                            }
-                                        })
                                     }
-
-                                })(resourceInfo[j]);
+                                })
+                            } else {
+                                count++;
+                                if (count === s3Data.length) {
+                                    next(null, []);
+                                }
                             }
-
-                        })(s3data[i]);
+                        })(s3Data[i]);
                     }
+                } else {
+                    next(null, bucketNames);
                 }
+            }], function (err, results) {
+            if (err) {
+                callback(err, null);
+                return;
             }
+            callback(null, results);
+            return;
         })
-    }else if(resourceType === 'RDS') {
-        resourceModel.getResourcesByProviderResourceType(providerId, resourceType, function (err, rdsdata) {
+    }
+}
+
+function deleteRDSResourceData(rdsInfo,providerId, callback) {
+    if(rdsInfo.length === 0){
+        resourceModel.deleteResourcesByResourceType('RDS', function (err, data) {
             if (err) {
-                callback(err, null);
+                callback(err,null);
+                return;
             } else {
-                var count = 0;
-                if (rdsdata.length === 0) {
-                    callback(null, []);
-                } else {
-                    for (var i = 0; i < rdsdata.length; i++) {
+                callback(null,rdsInfo);
+                return;
+            }
+        });
+    }else {
+        async.waterfall([
+            function (next) {
+                rdsDBNameList(rdsInfo, next);
+            },
+            function (dbNames, next) {
+                resourceModel.getResourcesByProviderResourceType(providerId, 'RDS', function (err, rdsData) {
+                    if (err) {
+                        next(err);
+                    } else {
+                        next(null, rdsData, dbNames);
+                    }
+                });
+            },
+            function (rdsData, dbNames, next) {
+                if (rdsData.length > 0) {
+                    var count = 0;
+                    for (var i = 0; i < rdsData.length; i++) {
                         (function (rds) {
-                            for (var j = 0; j < resourceInfo.length; j++) {
-                                (function (resource) {
-                                    if (rds.resourceDetails.dbName === resource.resourceDetails.dbName) {
+                            if (dbNames.indexOf(rds.resourceDetails.dbName) === -1) {
+                                resourceModel.deleteResourcesById(rds._id, function (err, data) {
+                                    if (err) {
+                                        next(err);
+                                    } else {
                                         count++;
-                                        if (count === resourceInfo.length) {
-                                            callback(null, []);
+                                        if (count === rdsData.length) {
+                                            next(null, data);
                                         }
-                                    } else {
-                                        resourceModel.deleteResourcesById(rds._id, function (err, data) {
-                                            if (err) {
-                                                callback(err, null);
-                                            } else {
-                                                count++;
-                                                if (count === resourceInfo.length) {
-                                                    callback(null, data);
-                                                }
-                                            }
-                                        })
                                     }
-
-                                })(resourceInfo[j]);
+                                })
+                            } else {
+                                count++;
+                                if (count === rdsData.length) {
+                                    next(null, []);
+                                }
                             }
-
-                        })(rdsdata[i]);
+                        })(rdsData[i]);
                     }
+                } else {
+                    next(null, dbNames);
                 }
+            }], function (err, results) {
+            if (err) {
+                callback(err, null);
+                return;
             }
+            callback(null, results);
+            return;
         })
     }
-
 }
 
+
 function tagMappingForResources(resources,provider,next){
     tagsModel.getTagsByProviderId(provider._id, function (err, tagDetails) {
         if (err) {
@@ -385,4 +428,24 @@ function tagMappingForResources(resources,provider,next){
             next(null,resources);
         }
     });
+}
+
+function bucketNameList(s3Info,callback){
+    var bucketNames=[];
+    for(var i = 0; i < s3Info.length; i++){
+        bucketNames.push(s3Info[i].resourceDetails.bucketName);
+        if(bucketNames.length === s3Info.length){
+            callback(null,bucketNames);
+        }
+    }
+}
+
+function rdsDBNameList(rdsInfo,callback){
+    var dbNames=[];
+    for(var i = 0; i < rdsInfo.length; i++){
+        dbNames.push(rdsInfo[i].resourceDetails.dbName);
+        if(dbNames.length === rdsInfo.length){
+            callback(null,dbNames);
+        }
+    }
 }
\ No newline at end of file
diff --git a/server/app/cronjobs/provider-sync/AWSProviderSync.js b/server/app/cronjobs/provider-sync/AWSProviderSync.js
index 3a6ddc203..b21f9f861 100644
--- a/server/app/cronjobs/provider-sync/AWSProviderSync.js
+++ b/server/app/cronjobs/provider-sync/AWSProviderSync.js
@@ -285,6 +285,7 @@ function tagMappingForInstances(instances,provider,next){
                                             subnetId: instance.subnetId,
                                             vpcId: instance.vpcId,
                                             privateIpAddress: instance.privateIpAddress,
+                                            hostName:instance.hostName,
                                             tags: instance.tags,
                                         }
                                         assignedInstanceList.push(assignedInstanceObj);
diff --git a/server/app/model/blueprint/blueprint-types/instance-blueprint/aws-blueprint/aws-blueprint.js b/server/app/model/blueprint/blueprint-types/instance-blueprint/aws-blueprint/aws-blueprint.js
index cfbc2c0a5..97493a7da 100755
--- a/server/app/model/blueprint/blueprint-types/instance-blueprint/aws-blueprint/aws-blueprint.js
+++ b/server/app/model/blueprint/blueprint-types/instance-blueprint/aws-blueprint/aws-blueprint.js
@@ -244,6 +244,7 @@ AWSInstanceBlueprintSchema.methods.launch = function(launchParams, callback) {
 							vpcId: instanceData.VpcId,
 							subnetId: instanceData.SubnetId,
 							privateIpAddress: instanceData.PrivateIpAddress,
+                            hostName:instanceData.PrivateDnsName,
                             credentials: {
                                 username: anImage.userName,
                                 pemFileLocation: encryptedPemFileLocation,
diff --git a/server/app/model/blueprint/blueprint.js b/server/app/model/blueprint/blueprint.js
index abd405c46..22ee42bb6 100755
--- a/server/app/model/blueprint/blueprint.js
+++ b/server/app/model/blueprint/blueprint.js
@@ -1383,6 +1383,20 @@ BlueprintSchema.statics.getBlueprintsByProjectIdOrEnvId = function(id, callback)
         callback(null, data);
     });
 };
+
+BlueprintSchema.statics.checkBPDependencyByFieldName = function(fieldName,id, callback) {
+    var queryObj = {
+        fieldName: id
+    }
+    Blueprints.find(queryObj, function(err, data) {
+        if (err) {
+            callback(err, null);
+            return;
+        }
+        callback(null, data);
+    });
+};
+
 var Blueprints = mongoose.model('blueprints', BlueprintSchema);
 
 module.exports = Blueprints;
diff --git a/server/app/model/classes/instance/instance.js b/server/app/model/classes/instance/instance.js
index 80ca1c0ef..de7e3b9c0 100755
--- a/server/app/model/classes/instance/instance.js
+++ b/server/app/model/classes/instance/instance.js
@@ -331,6 +331,11 @@ var InstanceSchema = new Schema({
         required: false,
         trim: true
     },
+    hostName: {
+        type: String,
+        required: false,
+        trim: true
+    },
     route53HostedParams: [Schema.Types.Mixed],
     isDeleted: {
         type: Boolean,
@@ -408,7 +413,6 @@ var InstancesDao = function() {
             orgId: orgId
         }
         queryObj['docker.dockerEngineStatus'] = 'success';
-        queryObj['isDeleted'] = false;
         Instances.find(queryObj, function(err, data) {
             if (err) {
                 logger.error("Failed getInstancesWithContainersByOrgId (%s)", orgId, err);
@@ -713,25 +717,25 @@ var InstancesDao = function() {
         });
     };
 
-    this.getInstanceByProjectId = function(ProjectId, callback) {
-        logger.debug("Enter getInstanceByProjectId (%s,)", ProjectId);
+    this.checkInstancesDependencyByFieldName = function(fieldName,id, callback) {
+        logger.debug("Enter checkInstancesDependencyByFieldName (%s,)", id);
         var queryObj = {
             $or: [{
-                projectId: ProjectId
+                projectId: id
             }, {
-                'chef.serverId': ProjectId
+                'chef.serverId': id
             }, {
-                serviceIds: ProjectId
-            }]
+                serviceIds: id
+            }],
+            isDeleted:false
         }
         Instances.find(queryObj, function(err, data) {
             if (err) {
-                logger.debug("Failed to getInstanceByProjectId (%s)", ProjectId);
+                logger.error(err);
                 callback(err, null);
                 return;
             }
-            logger.debug(JSON.stringify(data));
-            logger.debug("Exit getInstanceByProjectId (%s)", ProjectId);
+            logger.debug("Exit checkInstancesDependencyByFieldName");
             callback(null, data);
         });
     };
@@ -2131,6 +2135,7 @@ var InstancesDao = function() {
             updateObj['subnetId']= instance.subnetId;
             updateObj['instanceIP'] = instance.ip;
             updateObj['vpcId'] = instance.vpcId;
+            updateObj['hostName'] = instance.hostName;
             updateObj['privateIpAddress'] = instance.privateIpAddress;
             updateObj['tags'] = instance.tags;
         }
diff --git a/server/app/model/classes/tasks/tasks.js b/server/app/model/classes/tasks/tasks.js
index 10f31decb..829c08d20 100755
--- a/server/app/model/classes/tasks/tasks.js
+++ b/server/app/model/classes/tasks/tasks.js
@@ -82,6 +82,12 @@ var taskSchema = new Schema({
         required: true,
         trim: true
     },
+    shortDesc: {
+        type: String
+    },
+    botType: {
+        type: String
+    },
     description: {
         type: String
     },
@@ -672,6 +678,8 @@ taskSchema.statics.updateTaskById = function(taskId, taskData, callback) {
             name: taskData.name,
             taskConfig: taskConfig,
             taskType: taskData.taskType,
+            shortDesc: taskData.shortDesc,
+            botType: taskData.botType,
             description: taskData.description,
             jobResultURLPattern: taskData.jobResultURL,
             blueprintIds: taskData.blueprintIds
diff --git a/server/app/model/container/containers.js b/server/app/model/container/containers.js
index 3747ceba0..3517fd103 100644
--- a/server/app/model/container/containers.js
+++ b/server/app/model/container/containers.js
@@ -141,6 +141,21 @@ containerSchema.statics.getContainerByIdInstanceId = function(containerId,instan
     });
 };
 
+containerSchema.statics.getContainerByInstanceId = function(instanceId, callback) {
+    logger.debug("Enter getContainerByInstanceId");
+    container.find({
+        instanceId:instanceId
+    },function(err, aContainer) {
+        if (err) {
+            logger.error("getContainerByInstanceId Failed", err,instanceId);
+            callback(err, null);
+            return;
+        }
+        logger.debug("Exit getContainerByInstanceId : ");
+        callback(null, aContainer);
+    });
+};
+
 containerSchema.statics.updateContainerStatus = function(containerId,containerStatus,status,callback) {
     logger.debug("Enter updateContainerStatus");
     container.update({
diff --git a/server/app/model/d4dmasters/configmgmt.js b/server/app/model/d4dmasters/configmgmt.js
index ac51126e8..d316e391e 100755
--- a/server/app/model/d4dmasters/configmgmt.js
+++ b/server/app/model/d4dmasters/configmgmt.js
@@ -22,8 +22,8 @@ var appConfig = require('_pr/config');
 var chefSettings = appConfig.chef;
 var puppetSettings = appConfig.puppet;
 var logger = require('_pr/logger')(module);
-var blueprintdao = require('../dao/blueprints.js');
-var instancedao = require('../classes/instance/instance.js');
+var instanceModel = require('../classes/instance/instance.js');
+var async = require('async');
 
 function Configmgmt() {
     this.getDBModelFromID = function(id, callback) {
@@ -1131,104 +1131,76 @@ function Configmgmt() {
         });
     };
 
-    this.deleteCheck = function(rowid, formids, fieldname, callback) {
-        logger.debug("Delete Check request rcvd." + rowid + ' : ' + formids.toString() + ' : ' + fieldname);
-        var count = 0;
-        var exitloop = false;
-        //Building dynamic schema
-        var checkmasters = function(rowid, formids, fieldname) {
-            var delcheckquery = {};
-            delcheckquery.id = {
-                $in: formids
-            };
-            if (fieldname.indexOf(',') > 0) {
-                var fldn = fieldname.split(',');
-                for (flds in fldn) {
-                    delcheckquery[flds] = {
-                        $regex: ".*" + rowid + "*"
-                    };
-                }
-            } else
-                delcheckquery[fieldname] = {
-                    $regex: ".*" + rowid + "*"
-                };
-            d4dModelNew.d4dModelMastersGeneric.find(delcheckquery, function(err, d4dMasterJson) {
-                if (!err) {
-                    logger.debug(JSON.stringify(d4dMasterJson));
-                    if (d4dMasterJson.length > 0) {
-                        logger.debug('Found in ' + d4dMasterJson[0]['id'] + ' returning : ');
-                        callback(null, 'found');
-                        return;
-                    } else {
-                        callback(null, 'none');
-                        return;
-                    }
-
-                } else {
-                    logger.debug("Hit an error in deleteCheck:" + err);
-                    callback(err, null);
-                    return;
-                }
-
-            });
-        };
-        var checkBPInstances = function(rowid, tempplatescheck) {
-            blueprintdao.getBlueprintsByProjectId(rowid, function(err, data) {
-                if (!err) {
-                    logger.debug(JSON.stringify(data));
-                    if (data.length > 0) {
-                        logger.debug('Found in ' + data['name'] + ' returning : ');
-                        callback(null, 'found blueprints');
-                        return;
-                    } else {
-                        if (formids.indexOf('instances') < 0 && formids.indexOf('all') < 0) {
-                            callback(null, 'none');
-                            return;
-                        } else {
-                            instancedao.getInstanceByProjectId(rowid, function(err, data) {
-                                if (!err) {
-                                    if (data.length > 0) {
-                                        logger.debug('Found in ' + data['chefNodeName'] + ' returning : ');
-                                        callback(null, 'found instances');
-                                        return;
-                                    } else {
-                                        if (tempplatescheck != null) {
-                                            var ids = [];
-                                            ids.push('17');
-                                            ids.push('19');
-                                            checkmasters(rowid, ids, 'configname_rowid');
-                                        } else {
-                                            callback(null, 'none');
-                                            return;
-                                        }
+    this.deleteCheck = function(rowId,checkDependency, callback) {
+        if(checkDependency.length > 0) {
+            var results = [];
+            async.waterfall([
+                function(next){
+                    for (var i = 0; i < checkDependency.length; i++) {
+                        if (checkDependency[i].id === 'instances') {
+                            checkInstancesDependency(rowId, checkDependency[i], function (err, data) {
+                                if (err) {
+                                    logger.error(err);
+                                    next({errCode:500,
+                                        errMsg:"Error in Instance Dependency Check"}, null);
+                                }
+                                if (data !== 'none') {
+                                    next({errCode:412,
+                                        errMsg:data}, null);
+                                }else{
+                                    results.push(data);
+                                    if(results.length === checkDependency.length){
+                                        next(null, 'none');
+                                    }
+                                }
+                            });
+                        } else if (checkDependency[i].id === 'blueprints') {
+                            checkBPDependency(rowId, checkDependency[i], function (err, data) {
+                                if (err) {
+                                    logger.error(err);
+                                    next({errCode:500,
+                                        errMsg:"Error in Blueprint Dependency Check"}, null);
+                                }
+                                if (data !== 'none') {
+                                    next({errCode:412,
+                                        errMsg:data}, null);
+                                }else{
+                                    results.push(data);
+                                    if(results.length === checkDependency.length){
+                                        next(null, data);
                                     }
-                                } else {
-                                    logger.debug("Hit an error in deleteCheck getInstanceByProjectId:" + err);
-                                    callback(err, null);
+                                }
+                            });
+                        } else {
+                            checkMastersDependency(rowId, checkDependency[i], function (err, data) {
+                                if (err) {
+                                    logger.error(err);
+                                    next({errCode:500,
+                                        errMsg:"Error in Master Dependency Check"}, null);
                                     return;
                                 }
+                                if (data !== 'none') {
+                                    next({errCode:412,
+                                        errMsg:data}, null);
+                                }else{
+                                    results.push(data);
+                                    if(results.length === checkDependency.length){
+                                        next(null, data);
+                                    }
+                                }
                             });
                         }
                     }
-                } else {
-                    logger.debug("Hit an error in deleteCheck getBlueprintsByProjectId:" + err);
-                    callback(err, null);
+                }
+            ],function(err,results){
+                if(err){
+                    callback(err,null);
                     return;
                 }
-            });
-        };
-
-        if (formids.indexOf('blueprints') < 0 && formids.indexOf('instances') < 0 && formids.indexOf('all') < 0) {
-
-            checkmasters(rowid, formids, fieldname);
-        } else {
-            if (formids.indexOf('blueprints') >= 0) {
-
-                checkBPInstances(rowid, null);
-            } else if (formids.indexOf('all') >= 0) {
-                logger.debug('Entering all');
-                checkBPInstances(rowid, "checktemplates");
-            }
+                callback(null,results);
+            })
+        }else{
+            callback(null,'none');
         }
     };
 
@@ -1434,4 +1406,70 @@ function Configmgmt() {
 
 }
 
+function checkBPDependency(rowid, bpCheckDetails,callback) {
+    var blueprintModel = require('../blueprint/blueprint.js');
+    blueprintModel.checkBPDependencyByFieldName(bpCheckDetails.fieldName,rowid, function(err, data) {
+        if (err) {
+            logger.error(err);
+            callback(err, null);
+            return;
+        } else if (data.length > 0) {
+            logger.debug('Blueprint Found in ' + data['name'] + ' returning : ');
+            callback(null, bpCheckDetails.errMsg);
+            return;
+        } else {
+            callback(null, 'none');
+            return;
+        }
+    });
+}
+
+function checkInstancesDependency(rowid, instanceCheckDetails,callback) {
+    instanceModel.checkInstancesDependencyByFieldName(instanceCheckDetails.fieldName,rowid, function(err, data) {
+        if (err) {
+            logger.error(err);
+            callback(err, null);
+            return;
+        } else if (data.length > 0) {
+            logger.debug('Instance Found in ' + data['name'] + ' returning : ');
+            callback(null, instanceCheckDetails.errMsg);
+            return;
+        } else {
+            callback(null, 'none');
+            return;
+        }
+    });
+}
+
+function checkMastersDependency(rowid, masterCheckDetails,callback) {
+    var checkDependentQuery = {};
+    checkDependentQuery.id = masterCheckDetails.id;
+    if (masterCheckDetails.fieldName.indexOf(',') > 0) {
+        var fieldNames = masterCheckDetails.fieldName.split(',');
+        for (i in fieldNames) {
+            checkDependentQuery[i] = {
+                $regex: rowid
+            };
+        }
+    }else{
+        checkDependentQuery[masterCheckDetails.fieldName] = {
+            $regex: rowid
+        };
+    }
+    d4dModelNew.d4dModelMastersGeneric.find(checkDependentQuery, function(err, d4dMasterJson) {
+        if (err) {
+            logger.error(err);
+            callback(err, null);
+            return;
+        } else if (d4dMasterJson.length > 0) {
+            logger.debug('Master data Found in returning : ');
+            callback(null, masterCheckDetails.errMsg);
+            return;
+        } else {
+            callback(null,'none');
+            return;
+        }
+    });
+}
+
 module.exports = new Configmgmt();
diff --git a/server/app/model/log-trail/containerLog.js b/server/app/model/log-trail/containerLog.js
new file mode 100644
index 000000000..0eaa26435
--- /dev/null
+++ b/server/app/model/log-trail/containerLog.js
@@ -0,0 +1,143 @@
+/*
+Copyright [2016] [Relevance Lab]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+
+var mongoose = require('mongoose');
+var mongoosePaginate = require('mongoose-paginate');
+var ObjectId = require('mongoose').Types.ObjectId;
+var logger = require('_pr/logger')(module);
+
+var Schema = mongoose.Schema;
+var ContainerLogSchema = new Schema({
+    actionId: {
+        type: String,
+        unique: true
+    },
+    containerId: String,
+    orgName: String,
+    orgId: String,
+    bgName: String,
+    bgId: String,
+    projectName: String,
+    envName: String,
+    envId: String,
+    status: String,
+    actionStatus: String,
+    instanceIP: String,
+    platformId: String,
+    containerName: String,
+    Image: String,
+    ImageId: String,
+    platform: String,
+    os: String,
+    user: String,
+    createdOn: Number,
+    startedOn: Number,
+    endedOn: Number,
+    providerType: String,
+    action: String,
+    logs: [{
+        err: Boolean,
+        log: String,
+        timestamp: Number
+    }]
+});
+
+ContainerLogSchema.plugin(mongoosePaginate);
+var ContainerLogs = mongoose.model('containerlogs', ContainerLogSchema);
+
+var ContainerLog = function() {
+    this.createOrUpdate = function(logData, callback) {
+        ContainerLogs.find({
+            actionId: logData.actionId,
+            containerId: logData.containerId,
+            orgId: logData.orgId,
+            bgId: logData.bgId,
+            envId: logData.envId
+        }, function(err, data) {
+            if (err) {
+                logger.debug("Failed to fetch ContainerLogs: ", err);
+                return callback(err, null);
+            }
+            if (data && data.length > 0) {
+                var logObj = {
+                    status:logData.status,
+                    action:logData.action,
+                    actionStatus:logData.actionStatus,
+                    instanceIP:logData.instanceIP,
+                    user:logData.user,
+                    platform:logData.platform,
+                    containerName: logData.containerName,
+                    image:logData.image,
+                    os:logData.os,
+                    logs:logData.logs
+                };
+                if(logData.endedOn){
+                    logObj.endedOn = logData.endedOn;
+                };
+                ContainerLogs.update({
+                    actionId: logData.actionId,
+                    containerId: logData.containerId,
+                    orgId: logData.orgId,
+                    bgId: logData.bgId,
+                    envId: logData.envId
+                }, {
+                    $set: logObj
+                }, {
+                    upsert: false
+                }, function(err, updatedData) {
+                    if (err) {
+                        logger.debug("Failed to update: ", err);
+                        callback(err, null);
+                        return;
+                    }
+                    callback(null, updatedData);
+                    return;
+                });
+            } else {
+                var log = new ContainerLogs(logData);
+                log.save(function(err, data) {
+                    if (err) {
+                        logger.error("Failed to insertLog", err);
+                        if (typeof callback === 'function') {
+                            callback(err, null);
+                        }
+                        return;
+                    }
+                    if (typeof callback === 'function') {
+                        callback(null, data);
+                    }
+                });
+            }
+
+        });
+    };
+
+    this.getContainerActionLogs = function getContainerActionLogs(jsonData,callback){
+        ContainerLogs.paginate(jsonData.queryObj, jsonData.options, function (err, containerLogList) {
+            if (err) {
+                var err = new Error('Internal server error');
+                err.status = 500;
+                callback(err,null);
+            }
+            callback(null, containerLogList);
+        });
+    }
+
+};
+
+
+module.exports = new ContainerLog();
diff --git a/server/app/model/resource-costs/resource-costs.js b/server/app/model/resource-costs/resource-costs.js
index 9dacdbe80..426c0ad44 100644
--- a/server/app/model/resource-costs/resource-costs.js
+++ b/server/app/model/resource-costs/resource-costs.js
@@ -14,14 +14,17 @@
  limitations under the License.
  */
 
-var mongoose = require('mongoose');
-var logger = require('_pr/logger')(module);
-var Schema = mongoose.Schema;
+var mongoose = require('mongoose')
+require('mongoose-double')(mongoose)
+var logger = require('_pr/logger')(module)
+
+var SchemaTypes = mongoose.Schema.Types
+var Schema = mongoose.Schema
 
 // @TODO Date field types to be revised
 var ResourceCostsSchema = new Schema({
     cost: {
-        type: Number,
+        type: SchemaTypes.Double,
         required: true
     },
     currency: {
@@ -67,7 +70,7 @@ var ResourceCostsSchema = new Schema({
         required: false,
         trim: true
     },
-    billLineRecordId: {
+    billLineItemId: {
         type: String,
         required: true,
         trim: true
@@ -84,6 +87,11 @@ var ResourceCostsSchema = new Schema({
             default: 'Other',
             trim: true
         },
+        billRecordId: {
+            type: String,
+            required: false,
+            trim: true
+        },
         serviceName: {
             type: String,
             required: true,
@@ -123,7 +131,7 @@ var ResourceCostsSchema = new Schema({
     }
 })
 
-ResourceCostsSchema.index({'organizationId': 1, 'resourceId': 1, 'billLineRecordId': 1,
+ResourceCostsSchema.index({'organizationId': 1, 'billLineItemId': 1,
     'startTime': 1, 'interval': 1}, {'unique': true})
 
 ResourceCostsSchema.statics.saveResourceCost = function saveResourceCost(resourceCostData, callback) {
@@ -157,4 +165,4 @@ ResourceCostsSchema.statics.upsertResourceCost = function upsertResourceCost(res
 }
 
 var ResourceCosts = mongoose.model('ResourceCosts', ResourceCostsSchema)
-module.exports = ResourceCosts
\ No newline at end of file
+module.exports = ResourceCosts
diff --git a/server/app/model/resources/resources.js b/server/app/model/resources/resources.js
index dab068b75..4bd9cbe06 100644
--- a/server/app/model/resources/resources.js
+++ b/server/app/model/resources/resources.js
@@ -27,6 +27,7 @@ ResourceSchema.statics.getResourcesByProviderResourceType = function(providerId,
     var queryObj={};
     queryObj['providerDetails.id'] =providerId;
     queryObj['resourceType']=resourceType;
+    queryObj['isDeleted']=false;
     Resources.find(queryObj, function(err, data) {
         if (err) {
             logger.error("Failed to getResourcesByProviderResourceType", err);
@@ -84,7 +85,7 @@ ResourceSchema.statics.deleteResourcesById = function(resourceId,callback) {
         _id: new ObjectId(resourceId)
     }, {
         $set: {
-            isDelete: true
+            isDeleted: true
         }
     }, {
         upsert: false
diff --git a/server/app/model/unassigned-instances/unassigned-instances.js b/server/app/model/unassigned-instances/unassigned-instances.js
index 6108f11d1..f71a70358 100644
--- a/server/app/model/unassigned-instances/unassigned-instances.js
+++ b/server/app/model/unassigned-instances/unassigned-instances.js
@@ -68,6 +68,11 @@ var UnassignedInstancesSchema = new Schema({
         type: String,
         required: false,
         trim: true
+    },
+    hostName: {
+        type: String,
+        required: false,
+        trim: true
     }
 });
 UnassignedInstancesSchema.plugin(mongoosePaginate);
@@ -194,6 +199,7 @@ UnassignedInstancesSchema.statics.updateInstanceStatus = function updateInstance
         updateObj['subnetId']= instance.subnetId;
         updateObj['ip'] = instance.ip;
         updateObj['vpcId'] = instance.vpcId;
+        updateObj['hostName'] = instance.hostName;
         updateObj['privateIpAddress'] = instance.privateIpAddress;
         updateObj['tags'] = instance.tags;
     }
diff --git a/server/app/model/unmanaged-instance/unmanaged-instance.js b/server/app/model/unmanaged-instance/unmanaged-instance.js
index f83182a5a..562900b54 100644
--- a/server/app/model/unmanaged-instance/unmanaged-instance.js
+++ b/server/app/model/unmanaged-instance/unmanaged-instance.js
@@ -66,6 +66,11 @@ var UnmanagedInstanceSchema = new Schema({
 		type: String,
 		required: false,
 		trim: true
+	},
+	hostName: {
+		type: String,
+		required: false,
+		trim: true
 	}
 });
 UnmanagedInstanceSchema.plugin(mongoosePaginate);
@@ -299,6 +304,7 @@ UnmanagedInstanceSchema.statics.updateInstanceStatus = function updateInstanceSt
 		updateObj['subnetId']= instance.subnetId;
 		updateObj['ip'] = instance.ip;
 		updateObj['vpcId'] = instance.vpcId;
+		updateObj['hostName'] = instance.hostName;
 		updateObj['privateIpAddress'] = instance.privateIpAddress;
 		updateObj['tags'] = instance.tags;
 	}
diff --git a/server/app/routes/v1.0/routes_appdeploy.js b/server/app/routes/v1.0/routes_appdeploy.js
index f69eb38eb..d489f04a6 100755
--- a/server/app/routes/v1.0/routes_appdeploy.js
+++ b/server/app/routes/v1.0/routes_appdeploy.js
@@ -54,6 +54,9 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
             if (instance.length) {
                 var anInstance = instance[0];
                 appDeployData['projectId'] = anInstance.projectId;
+                if(typeof appDeployData.hostName ==='undefined' || appDeployData.hostName === '' || appDeployData.hostName === null || appDeployData.hostName ==='null'){
+                    appDeployData.hostName = anInstance.hostName;
+                }
                 AppDeploy.createNew(appDeployData, function(err, appDeploy) {
                     if (err) {
                         res.status(500).send(errorResponses.db.error);
diff --git a/server/app/routes/v1.0/routes_audit_trails.js b/server/app/routes/v1.0/routes_audit_trails.js
index f1e6c3f4b..ef8dff3bb 100644
--- a/server/app/routes/v1.0/routes_audit_trails.js
+++ b/server/app/routes/v1.0/routes_audit_trails.js
@@ -20,6 +20,7 @@ var instanceService = require('_pr/services/instanceService');
 var logger = require('_pr/logger')(module);
 var taskService = require('_pr/services/taskService');
 var instanceLogModel = require('_pr/model/log-trail/instanceLog.js');
+var containerLogModel = require('_pr/model/log-trail/containerLog.js');
 var apiUtil = require('_pr/lib/utils/apiUtil.js');
 
 module.exports.setRoutes = function(app, sessionVerificationFunc) {
@@ -75,7 +76,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
             [
 
                 function(next) {
-                    apiUtil.paginationRequest(req.query, 'taskLogs', next);
+                    apiUtil.paginationRequest(req[0].query, 'taskLogs', next);
                 },
                 function(paginationReq, next) {
                     reqData = paginationReq;
@@ -153,4 +154,57 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                     return res.status(200).send(results);
             });
     }
+
+
+    app.get('/audit-trail/container-action', getContainerActionList);
+
+    function getContainerActionList(req, res, next) {
+        var reqData = {};
+        async.waterfall(
+            [
+                function(next) {
+                    apiUtil.paginationRequest(req.query, 'containerLogs', next);
+                },
+                function(paginationReq, next) {
+                    paginationReq['searchColumns'] = ['platformId', 'status', 'action', 'user', 'actionStatus', 'orgName', 'bgName', 'projectName', 'environmentName', 'containerName', 'image'];
+                    reqData = paginationReq;
+                    apiUtil.databaseUtil(paginationReq, next);
+                },
+                function(dataQuery, next) {
+                    containerLogModel.getContainerActionLogs(dataQuery, next);
+                },
+                function(instanceActions, next) {
+                    apiUtil.paginationResponse(instanceActions, reqData, next);
+                }
+            ],
+            function(err, results) {
+                if (err)
+                    return res.status(500).send(err);
+                else
+                    return res.status(200).send(results);
+            });
+    }
+
+    app.get('/audit-trail/container-action/:actionId/logs', pollContainerActionLog);
+
+    function pollContainerActionLog(req, res, next) {
+        var timestamp = req.query.timestamp;
+        if (timestamp) {
+            timestamp = parseInt(timestamp);
+        }
+        async.waterfall(
+            [
+                function(next) {
+                    logsDao.getLogsByReferenceId(req.params.actionId, timestamp, next);
+                }
+            ],
+            function(err, results) {
+                if (err)
+                    return res.status(500).send(err);
+                else
+                    return res.status(200).send(results);
+            });
+    }
+
+
 };
diff --git a/server/app/routes/v1.0/routes_d4dMasters.js b/server/app/routes/v1.0/routes_d4dMasters.js
index 22253b662..c994d9849 100755
--- a/server/app/routes/v1.0/routes_d4dMasters.js
+++ b/server/app/routes/v1.0/routes_d4dMasters.js
@@ -328,36 +328,64 @@ module.exports.setRoutes = function(app, sessionVerification) {
                     res.status(500).send("Failed to fetch User.");
                 }
                 if (anUser) {
-                    var tocheck = [];
-                    var fieldname = '';
+                    var toCheck = [];
                     switch (req.params.id) {
                         case "1":
-                            tocheck.push('2');
-                            tocheck.push('3');
-                            tocheck.push('10');
-                            fieldname = "orgname_rowid";
+                            toCheck.push({id:'10',
+                                errMsg:'Organization is associated with Chef-Server.To delete organization please delete respective Chef-Server first.',
+                                fieldName:'orgname_rowid'
+                            });
+                            toCheck.push({id:'3',
+                                errMsg:'Organization is associated with some Environments.To delete organization please delete respective Environments first.',
+                                fieldName:'orgname_rowid'
+                            });
+                            toCheck.push({id:'2',
+                                errMsg:'Organization is associated with some Business Groups.To delete organization please delete respective Business Groups first.',
+                                fieldName:'orgname_rowid'
+                            });
                             break;
                         case "2":
-                            tocheck.push('4');
-                            fieldname = "productgroupname_rowid";
+                            toCheck.push({id:'4',
+                                errMsg:'Business Group is associated with some Projects.To delete business group please delete respective Projects first.',
+                                fieldName:'productgroupname_rowid'
+                            });
                             break;
                         case "3":
-                            tocheck.push('4');
-                            fieldname = "environmentname_rowid,orgname_rowid";
+                            toCheck.push({id:'4',
+                                errMsg:'Environment is associated with some Projects.To delete business group please delete respective Projects first.',
+                                fieldName:'environmentname_rowid,orgname_rowid'
+                            });
                             break;
                         case "4":
-                            tocheck.push('blueprints');
-                            tocheck.push('instances');
-                            fieldname = "projectId";
+                            toCheck.push({id:'instances',
+                                errMsg:'Project is associated with some Instances.To delete Project please delete respective instances first.',
+                                fieldName:'projectId'
+                            });
+                            toCheck.push({id:'blueprints',
+                                errMsg:'Project is associated with some Blueprints.To delete Project please delete respective blueprints first.',
+                                fieldName:'projectId'
+                            });
                             break;
                         case "10":
-                            tocheck.push('all');
-                            fieldname = "configname_rowid";
+                            toCheck.push({id:'instances',
+                                errMsg:'Chef-Server already used by Some Instances.To delete Chef-Server please delete respective instances first.',
+                                fieldName:'configname_rowid'
+                            });
+                            toCheck.push({id:'3',
+                                errMsg:'Chef-Server already used by Some Enviornments.To delete Chef-Server please delete respective enviornments first.',
+                                fieldName : 'configname_rowid'
+                            });
+                            
                             break;
                         case "19":
-                            tocheck.push('blueprints');
-                            tocheck.push('instances');
-                            fieldname = "projectId";
+                            toCheck.push({id:'instances',
+                                errMsg:'Project is associated with some Instances.To delete Project please delete respective instances first.',
+                                fieldName:'projectId'
+                            });
+                            toCheck.push({id:'blueprints',
+                                errMsg:'Project is associated with some Blueprints.To delete Project please delete respective blueprints first.',
+                                fieldName:'projectId'
+                            });
                             break;
                     }
 
@@ -372,9 +400,17 @@ module.exports.setRoutes = function(app, sessionVerification) {
                                     res.status(500).send("Error from DB.");
                                     return;
                                 }
-                                configmgmtDao.deleteCheck(req.params.fieldvalue, tocheck, fieldname, function(err, data) {
-                                    logger.debug("Delete check returned: %s", data);
-                                    if (data == "none") {
+                                configmgmtDao.deleteCheck(req.params.fieldvalue, toCheck, function(err, data) {
+                                    if(err){
+                                        if(err.errCode === 500){
+                                            res.status(500).send(err.errMsg);
+                                            return;
+                                        }else{
+                                            logger.debug("There are dependent elements which are not deleted");
+                                            res.send(412, err.errMsg);
+                                            return;
+                                        }
+                                    }else{
                                         logger.debug("entering delete");
                                         configmgmtDao.getDBModelFromID(req.params.id, function(err, dbtype) {
                                             if (err) {
@@ -398,17 +434,21 @@ module.exports.setRoutes = function(app, sessionVerification) {
                                                 }); //end findOne
                                             }
                                         }); //end configmgmtDao
-                                    } else {
-                                        logger.debug("There are dependent elements cannot delete");
-                                        res.send(412, "Cannot proceed with delete. \n Dependent elements found");
-                                        return;
                                     }
-                                }); //deleteCheck
+                                }); 
                             });
                         } else {
-                            configmgmtDao.deleteCheck(req.params.fieldvalue, tocheck, fieldname, function(err, data) {
-                                logger.debug("Delete check returned: %s", data);
-                                if (data == "none") {
+                            configmgmtDao.deleteCheck(req.params.fieldvalue, toCheck, function(err, data) {
+                                if(err){
+                                    if(err.errCode === 500){
+                                        res.status(500).send(err.errMsg);
+                                        return;
+                                    }else{
+                                        logger.debug("There are dependent elements which are not deleted");
+                                        res.send(412, err.errMsg);
+                                        return;
+                                    }
+                                }else{
                                     logger.debug("entering delete");
                                     configmgmtDao.getDBModelFromID(req.params.id, function(err, dbtype) {
                                         if (err) {
@@ -465,7 +505,6 @@ module.exports.setRoutes = function(app, sessionVerification) {
                                                 eval('d4dModelNew.' + dbtype).findOne({
                                                     rowid: req.params.fieldvalue
                                                 }, function (err,data) {
-                                                    logger.debug('data>>>',data);
                                                     if (err) {
                                                         logger.debug("Hit an errror on fetching data : %s", err);
                                                         res.send(500);
@@ -507,10 +546,6 @@ module.exports.setRoutes = function(app, sessionVerification) {
                                             }
                                         }
                                     }); //end configmgmtDao
-                                } else {
-                                    logger.debug("There are dependent elements cannot delete");
-                                    res.send(412, "Cannot proceed with delete. \n Dependent elements found");
-                                    return;
                                 }
                             }); //deleteCheck
                         }
@@ -2501,27 +2536,27 @@ module.exports.setRoutes = function(app, sessionVerification) {
                                                             var templatetypename;
                                                             var designtemplateicon_filename;
                                                             var templatetype;
-                                                            if (x1 === 0) {
-                                                                templatetypename = "SoftwareStack";
-                                                                designtemplateicon_filename = "Appfactory.png";
-                                                                templatetype = "chef";
+                                                            if(x1 === 0) {
+                                                                templatetypename = "Docker";
+                                                                designtemplateicon_filename = "Docker.png";
+                                                                templatetype = "docker";
                                                             } else if (x1 === 1) {
                                                                 templatetypename = "OSImage";
                                                                 designtemplateicon_filename = "Desktop Provisining.png";
                                                                 templatetype = "ami";
                                                             } else if (x1 === 2) {
+                                                                templatetypename = "SoftwareStack";
+                                                                designtemplateicon_filename = "Appfactory.png";
+                                                                templatetype = "chef";
+                                                            } else if (x1 === 3) {
                                                                 templatetypename = "CloudFormation";
                                                                 designtemplateicon_filename = "CloudFormation.png";
                                                                 templatetype = "cft";
 
-                                                            } else if (x1 === 3) {
+                                                            } else if (x1 === 4) {
                                                                 templatetypename = "ARMTemplate";
                                                                 designtemplateicon_filename = "CloudFormation.png";
                                                                 templatetype = "arm";
-                                                            } else if(x1 === 4) {
-                                                                templatetypename = "Docker";
-                                                                designtemplateicon_filename = "Docker.png";
-                                                                templatetype = "docker";
                                                             } else {
                                                                 templatetypename = "Composite";
                                                                 designtemplateicon_filename = "composite.png";
@@ -2681,8 +2716,35 @@ module.exports.setRoutes = function(app, sessionVerification) {
 
                                                     });
                                                     if (x === rowId.length - 1) {
-                                                        res.send(200);
-                                                        return;
+                                                        if (bodyJson['orgname_rowid'] === '' || bodyJson['orgname_rowid'] === null) {
+                                                            res.send(200);
+                                                            return;
+                                                        }else {
+                                                            settingWizard.getSettingWizardByOrgId(bodyJson['orgname_rowid'], function (err, settingWizards) {
+                                                                if (err) {
+                                                                    logger.error('Hit getting setting wizard error', err);
+                                                                    res.send(500);
+                                                                    return;
+                                                                }
+                                                                if (settingWizards.currentStep.name === 'User Configuration') {
+                                                                    var settingWizardSteps = appConfig.settingWizardSteps;
+                                                                    settingWizards.currentStep.nestedSteps[1].isCompleted = true;
+                                                                    settingWizards.currentStep.isCompleted = true;
+                                                                    settingWizards.previousStep = settingWizards.currentStep;
+                                                                    settingWizards.currentStep = settingWizards.nextStep;
+                                                                    settingWizards.nextStep = settingWizardSteps[5];
+                                                                    settingWizard.updateSettingWizard(settingWizards, function (err, data) {
+                                                                        if (err) {
+                                                                            logger.error('Hit getting setting wizard error', err);
+                                                                            res.send(500);
+                                                                            return;
+                                                                        }
+                                                                        res.send(200);
+                                                                        return;
+                                                                    });
+                                                                }
+                                                            })
+                                                        }
                                                     }
                                                 }
                                             });
@@ -2812,13 +2874,8 @@ module.exports.setRoutes = function(app, sessionVerification) {
                                                         res.send(500);
                                                         return;
                                                     }
-                                                    if(settingWizards.currentStep.name === 'Config Management') {
-                                                        var settingWizardSteps = appConfig.settingWizardSteps;
-                                                        settingWizards.currentStep.nestedSteps[2].isCompleted = true;
-                                                        settingWizards.currentStep.isCompleted = true;
-                                                        settingWizards.previousStep = settingWizards.currentStep;
-                                                        settingWizards.currentStep = settingWizards.nextStep;
-                                                        settingWizards.nextStep = settingWizardSteps[4];
+                                                    if(settingWizards.currentStep.name === 'User Configuration') {
+                                                        settingWizards.currentStep.nestedSteps[0].isCompleted = true;
                                                         settingWizard.updateSettingWizard(settingWizards, function (err, data) {
                                                             if (err) {
                                                                 logger.error('Hit getting setting wizard error', err);
@@ -2899,7 +2956,7 @@ module.exports.setRoutes = function(app, sessionVerification) {
                                                         settingWizards.currentStep.isCompleted = true;
                                                         settingWizards.previousStep = settingWizards.currentStep;
                                                         settingWizards.currentStep = settingWizards.nextStep;
-                                                        settingWizards.nextStep = {wizardStatus:'true'};
+                                                        settingWizards.nextStep = settingWizards.nextStep;
                                                         settingWizard.updateSettingWizard(settingWizards, function (err, data) {
                                                             if (err) {
                                                                 logger.error('Hit getting setting wizard error', err);
@@ -2937,7 +2994,12 @@ module.exports.setRoutes = function(app, sessionVerification) {
                                                         return;
                                                     }
                                                     if(settingWizards.currentStep.name === 'Config Management') {
+                                                        var settingWizardSteps = appConfig.settingWizardSteps;
                                                         settingWizards.currentStep.nestedSteps[1].isCompleted = true;
+                                                        settingWizards.currentStep.isCompleted = true;
+                                                        settingWizards.previousStep = settingWizards.currentStep;
+                                                        settingWizards.currentStep = settingWizards.nextStep;
+                                                        settingWizards.nextStep = settingWizardSteps[4];
                                                         settingWizard.updateSettingWizard(settingWizards, function (err, data) {
                                                             if (err) {
                                                                 logger.error('Hit getting setting wizard error', err);
diff --git a/server/app/routes/v1.0/routes_instances.js b/server/app/routes/v1.0/routes_instances.js
index e16f7c577..7de7c0b9e 100755
--- a/server/app/routes/v1.0/routes_instances.js
+++ b/server/app/routes/v1.0/routes_instances.js
@@ -56,6 +56,7 @@ var GCP = require('_pr/lib/gcp.js');
 var async = require('async');
 var apiUtil = require('_pr/lib/utils/apiUtil.js');
 var instanceLogModel = require('_pr/model/log-trail/instanceLog.js');
+var containerLogModel = require('_pr/model/log-trail/containerLog.js');
 var instanceService = require('_pr/services/instanceService');
 var chefDao = require('_pr/model/dao/chefDao.js');
 
@@ -830,7 +831,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                 res.send(500);
                 return;
             }
-            var actionObj = 'Docker-Container '+action.charAt(0).toUpperCase() + action.slice(1) + ' : ' + containers[0].Names[0];
+            var actionObj = 'Container-'+ containers[0].Names+'-'+action.charAt(0).toUpperCase() + action.slice(1);
             instancesDao.getInstanceById(req.params.instanceid, function (err, instance) {
                 if (err) {
                     logger.error("Instance fetch Failed >> ", err);
@@ -843,42 +844,48 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                 logsDao.insertLog({
                     referenceId: logReferenceIds,
                     err: false,
-                    log: "Docker-Container " + action.charAt(0).toUpperCase() + action.slice(1)  + 'ing',
+                    log: "Docker-Container "+ containers[0].Names + ' ' + action.charAt(0).toUpperCase() + action.slice(1)  + 'ing',
                     timestamp: timestampStarted
                 });
-                var instanceLog = {
+
+                var containerLog ={
                     actionId: actionLog._id,
-                    instanceId: instance[0]._id,
+                    containerId: containers[0].Id,
                     orgName: instance[0].orgName,
+                    orgId: instance[0].orgId,
                     bgName: instance[0].bgName,
+                    bgId: instance[0].bgId,
                     projectName: instance[0].projectName,
                     envName: instance[0].environmentName,
-                    status: instance[0].instanceState,
+                    envId: instance[0].envId,
+                    status: action.charAt(0).toUpperCase() + action.slice(1),
                     actionStatus: "pending",
+                    instanceIP:instance[0].instanceIP,
                     platformId: instance[0].platformId,
-                    blueprintName: instance[0].blueprintData.blueprintName,
-                    data: instance[0].runlist,
+                    containerName: containers[0].Names,
+                    Image: containers[0].Image,
+                    ImageID: containers[0].ImageID,
                     platform: instance[0].hardware.platform,
                     os: instance[0].hardware.os,
-                    size: instance[0].instanceType,
-                    user: req.session.user.cn,
+                    user: instance[0].catUser,
                     createdOn: new Date().getTime(),
                     startedOn: new Date().getTime(),
-                    providerType: instance[0].providerType,
-                    action: actionObj,
+                    providerType: instance[0].providerType ? instance[0].providerType:null,
+                    action: action.charAt(0).toUpperCase() + action.slice(1),
                     logs: []
                 };
+
                 containerService.executeActionOnContainer(jsonData, function (err, containerResponse) {
                     if (err) {
-                        instanceLog.actionStatus = "failed";
-                        instanceLog.endedOn = new Date().getTime();
+                        containerLog.actionStatus = "failed";
+                        containerLog.endedOn = new Date().getTime();
                         logsDao.insertLog({
                             referenceId: logReferenceIds,
                             err: true,
                             log: 'Failed to Excute Docker command: ' + err,
                             timestamp: timestampStarted
                         });
-                        instanceLogModel.createOrUpdate(actionLog._id, instance[0]._id, instanceLog, function (err, logData) {
+                        containerLogModel.createOrUpdate(containerLog, function(err, logData){
                             if (err) {
                                 logger.error("Failed to create or update instanceLog: ", err);
                             }
@@ -888,29 +895,29 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                         res.send(500);
                         return;
                     }
-                    instanceLog.actionStatus = "success";
-                    instanceLog.endedOn = new Date().getTime();
+                    containerLog.actionStatus = "success";
+                    containerLog.endedOn = new Date().getTime();
                     if(action === 'stop'){
                         logsDao.insertLog({
                             referenceId: logReferenceIds,
                             err: false,
-                            log: "Docker-Container Successfully " + action.charAt(0).toUpperCase() + action.slice(1)  + 'ped',
+                            log: "Docker-Container Successfully "+ containers[0].Names + ' ' + action.charAt(0).toUpperCase() + action.slice(1)  + 'ped',
                             timestamp: timestampStarted
                         });
                     }else {
                         logsDao.insertLog({
                             referenceId: logReferenceIds,
                             err: false,
-                            log: "Docker-Container Successfully " + action.charAt(0).toUpperCase() + action.slice(1)  + 'ed',
+                            log: "Docker-Container Successfully " + containers[0].Names + ' ' + action.charAt(0).toUpperCase() + action.slice(1)  + 'ed',
                             timestamp: timestampStarted
                         });
                     }
-                    instancesDao.updateActionLog(instance[0]._id, actionLog._id, true, new Date().getTime());
-                    instanceLogModel.createOrUpdate(actionLog._id, instance[0]._id, instanceLog, function (err, logData) {
+                    containerLogModel.createOrUpdate(containerLog, function(err, logData){
                         if (err) {
                             logger.error("Failed to create or update instanceLog: ", err);
                         }
                     });
+                    instancesDao.updateActionLog(instance[0]._id, actionLog._id, true, new Date().getTime());
                     res.status(200).send(containerResponse);
 
                 });
diff --git a/server/app/routes/v1.0/routes_organizations.js b/server/app/routes/v1.0/routes_organizations.js
index 8c1f130dc..d89d267e9 100755
--- a/server/app/routes/v1.0/routes_organizations.js
+++ b/server/app/routes/v1.0/routes_organizations.js
@@ -98,7 +98,7 @@ module.exports.setRoutes = function(app, sessionVerification) {
                 if(masterDetails.length > 0){
                     masterDetailList = masterDetails;
                     d4dModelNew.d4dModelMastersOrg.find({
-                            id: 1,
+                            id: '1',
                             active: true,
                             rowid: {
                                 $in: masterDetails[0].orgs
@@ -126,7 +126,7 @@ module.exports.setRoutes = function(app, sessionVerification) {
                         }
                     }
                 }else{
-                    next('No Org is there.',null);
+                    next(null,orgList);
                 }
             },
             function(orgTree,next){
@@ -136,8 +136,10 @@ module.exports.setRoutes = function(app, sessionVerification) {
                     for(var i = 0; i < orgTree.length;i++){
                         (function(org){
                             d4dModelNew.d4dModelMastersProductGroup.find({
-                                id: 2,
-                                orgname_rowid:org.rowid,
+                                id: '2',
+                                orgname_rowid:{
+                                    $in :[org.rowid]
+                                },
                                 rowid: {
                                     $in: masterDetailList[0].bunits
                                 }
@@ -145,6 +147,7 @@ module.exports.setRoutes = function(app, sessionVerification) {
                                 if(err){
                                     next(err);
                                 }else if(bgList.length > 0){
+                                    orgCount++;
                                     for(var j = 0; j < bgList.length;j++){
                                         (function(bg){
                                             var bgObj = {
@@ -159,7 +162,6 @@ module.exports.setRoutes = function(app, sessionVerification) {
                                                 bgObj.projects = data;
                                                 org.businessGroups.push(bgObj);
                                                 bgObjList.push(bgObj);
-                                                orgCount++;
                                                 if(orgCount === orgTree.length && bgObjList.length === bgList.length){
                                                     next(null,orgTree);
                                                 }
@@ -176,7 +178,7 @@ module.exports.setRoutes = function(app, sessionVerification) {
                         })(orgTree[i]);
                     }
                 }else{
-                    next('No Org Tree is there.',null);
+                    next(null,orgTree);
                 }
             },
             function(orgBgProjectTree,next){
@@ -215,7 +217,7 @@ module.exports.setRoutes = function(app, sessionVerification) {
                         }
                     });
                 }else{
-                    next('No Org Bg Project Tree is there.',null);
+                    next(null,orgBgProjectTree);
                 }
             }
         ],function(err,results){
@@ -246,7 +248,7 @@ module.exports.setRoutes = function(app, sessionVerification) {
                 if(masterDetails.length > 0){
                     masterDetailList = masterDetails;
                     d4dModelNew.d4dModelMastersOrg.find({
-                        id: 1,
+                        id: '1',
                         active: true,
                         rowid: {
                             $in: masterDetails[0].orgs
@@ -280,7 +282,7 @@ module.exports.setRoutes = function(app, sessionVerification) {
                         }
                     }
                 }else{
-                    next('No Org is there.',null);
+                    next(null,orgList);
                 }
             },
             function(orgTree,next){
@@ -290,8 +292,10 @@ module.exports.setRoutes = function(app, sessionVerification) {
                     for(var i = 0; i < orgTree.length;i++){
                         (function(org){
                             d4dModelNew.d4dModelMastersProductGroup.find({
-                                id: 2,
-                                orgname_rowid:org.rowid,
+                                id: '2',
+                                orgname_rowid:{
+                                    $in :[org.rowid]
+                                },
                                 rowid: {
                                     $in: masterDetailList[0].bunits
                                 }
@@ -299,6 +303,7 @@ module.exports.setRoutes = function(app, sessionVerification) {
                                 if(err){
                                     next(err);
                                 }else if(bgList.length > 0){
+                                    orgCount++;
                                     for(var j = 0; j < bgList.length;j++){
                                         (function(bg){
                                             var bgObj = {
@@ -336,7 +341,6 @@ module.exports.setRoutes = function(app, sessionVerification) {
                                                 org.businessGroups.push(bgObj);
                                                 org.nodes.push(nodeObj);
                                                 bgObjList.push(bgObj);
-                                                orgCount++;
                                                 if(orgCount === orgTree.length && bgObjList.length === bgList.length){
                                                     next(null,orgTree);
                                                 }
@@ -353,7 +357,7 @@ module.exports.setRoutes = function(app, sessionVerification) {
                         })(orgTree[i]);
                     }
                 }else{
-                    next('No Org Tree is there.',null);
+                    next(null,orgTree);
                 }
             },
             function(orgBgProjectTree,next){
@@ -392,7 +396,7 @@ module.exports.setRoutes = function(app, sessionVerification) {
                         }
                     });
                 }else{
-                    next('No Org Bg Project Tree is there.',null);
+                    next(null,orgBgProjectTree);
                 }
             }
         ],function(err,results){
diff --git a/server/app/routes/v1.0/routes_providercommon.js b/server/app/routes/v1.0/routes_providercommon.js
index 7a95da115..1396ae901 100644
--- a/server/app/routes/v1.0/routes_providercommon.js
+++ b/server/app/routes/v1.0/routes_providercommon.js
@@ -425,6 +425,9 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                                                                 instanceIP: unmanagedInstance.ip,
                                                                 instanceState: unmanagedInstance.state,
                                                                 network: unmanagedInstance.network,
+                                                                vpcId: unmanagedInstance.vpcId,
+                                                                privateIpAddress: unmanagedInstance.privateIpAddress,
+                                                                hostName: unmanagedInstance.hostName,
                                                                 bootStrapStatus: 'waiting',
                                                                 hardware: {
                                                                     platform: 'unknown',
diff --git a/server/app/routes/v1.0/routes_scripts.js b/server/app/routes/v1.0/routes_scripts.js
index 6c51c28b2..a9d3d3fb4 100644
--- a/server/app/routes/v1.0/routes_scripts.js
+++ b/server/app/routes/v1.0/routes_scripts.js
@@ -75,7 +75,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                         settingWizards.currentStep.isCompleted = true;
                         settingWizards.previousStep = settingWizards.currentStep;
                         settingWizards.currentStep = settingWizards.nextStep;
-                        settingWizards.nextStep = settingWizardSteps[6];
+                        settingWizards.nextStep = {name:'Wizard Status',isCompleted:true};
                         settingWizard.updateSettingWizard(settingWizards, function (err, data) {
                             if (err) {
                                 logger.error('Hit updating setting wizard error', err);
diff --git a/server/app/routes/v1.0/routes_vmImages.js b/server/app/routes/v1.0/routes_vmImages.js
index 39bebdb5c..736a69915 100755
--- a/server/app/routes/v1.0/routes_vmImages.js
+++ b/server/app/routes/v1.0/routes_vmImages.js
@@ -230,7 +230,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                                                     settingWizards.currentStep.isCompleted = true;
                                                     settingWizards.previousStep = settingWizards.currentStep;
                                                     settingWizards.currentStep = settingWizards.nextStep;
-                                                    settingWizards.nextStep = settingWizardSteps[5];
+                                                    settingWizards.nextStep = settingWizardSteps[6];
                                                     settingWizard.updateSettingWizard(settingWizards, function (err, data) {
                                                         if (err) {
                                                             logger.error('Hit getting setting wizard error', err);
diff --git a/server/app/services/analyticsService.js b/server/app/services/analyticsService.js
index 9c8770394..fe9651ac5 100644
--- a/server/app/services/analyticsService.js
+++ b/server/app/services/analyticsService.js
@@ -34,6 +34,7 @@ analyticsService.aggregateEntityCosts
 		return appConfig.aws.services[key]
 	})
 
+	var offset = (new Date()).getTimezoneOffset()*60000
 	var startTime
 	var interval
 	switch (period) {
@@ -49,8 +50,8 @@ analyticsService.aggregateEntityCosts
 
 	async.forEach(catalystEntityHierarchy[parentEntity].children, function (childEntity, next0) {
 		var query = parentEntityQuery
-		query.startTime = {$gte: Date.parse(startTime)}
-		query.endTime = {$lte: Date.parse(endTime)}
+		query.startTime = {$gte: Date.parse(startTime) + offset}
+		query.endTime = {$lte: Date.parse(endTime) + offset}
 
 		async.waterfall([
 			function(next1) {
diff --git a/server/app/services/resourceService.js b/server/app/services/resourceService.js
index bb7aed18b..7c2e5851b 100644
--- a/server/app/services/resourceService.js
+++ b/server/app/services/resourceService.js
@@ -89,6 +89,7 @@ function updateAWSResourceCostsFromCSV(provider, resources, downlaodedCSVPath, u
     var awsBillIndexes = appConfig.aws.billIndexes
     var awsServices = appConfig.aws.services
     var awsZones = appConfig.aws.zones
+    var lineNumber = 0
 
     var stream = fs.createReadStream(downlaodedCSVPath)
     csv.fromStream(stream, {headers: false}).on('data', function(data) {
@@ -104,7 +105,8 @@ function updateAWSResourceCostsFromCSV(provider, resources, downlaodedCSVPath, u
             resourceCostEntry.lastUpdateTime = Date.parse(updateTime)
             resourceCostEntry.interval = 3600
             resourceCostEntry.platformDetails.serviceName = data[awsBillIndexes.prod]
-            resourceCostEntry.billLineRecordId = data[awsBillIndexes.recordId]
+            resourceCostEntry.billLineItemId = ++lineNumber
+            resourceCostEntry.platformDetails.billRecordId = data[awsBillIndexes.recordId]
 
             if (data[awsBillIndexes.prod] in awsServices) {
                 resourceCostEntry.platformDetails.serviceId = awsServices[data[awsBillIndexes.prod]]
@@ -715,6 +717,7 @@ function getEC2InstancesInfo(provider,orgName,callback) {
                                         providerData: region,
                                         platformId: instance.InstanceId,
                                         ip: instance.PublicIpAddress || null,
+                                        hostName:instance.PrivateDnsName,
                                         os: (instance.Platform && instance.Platform === 'windows') ? 'windows' : 'linux',
                                         state: instance.State.Name,
                                         subnetId: instance.SubnetId,
@@ -1131,5 +1134,4 @@ function updateDomainNameForInstance(domainName,publicIP,instanceId,awsSettings,
         callback(null,results);
         return;
     })
-}
-
+}
\ No newline at end of file
diff --git a/server/app/services/settingsService.js b/server/app/services/settingsService.js
index 9ca34e793..a2fe7b462 100644
--- a/server/app/services/settingsService.js
+++ b/server/app/services/settingsService.js
@@ -164,10 +164,19 @@ settingsService.trackSettingWizard = function trackSettingWizard(id,orgId,callba
                callback(err, null);
                return;
            }
-           if (settingWizards.currentStep.name === 'Config Management'
-               && settingWizards.currentStep.nestedSteps[1].isCompleted === true) {
+           if (settingWizards.currentStep.name === 'User Configuration'
+               && settingWizards.currentStep.nestedSteps[0].isCompleted === false) {
+               var settingWizardSteps = appConfig.settingWizardSteps;
+               var previousStep = settingWizardSteps[1];
+               previousStep.nestedSteps[0].isCompleted = true;
+               previousStep.nestedSteps[1].isCompleted = true;
+               previousStep.nestedSteps[2].isCompleted = true;
+               previousStep.isCompleted = true;
+               settingWizards.currentStep = settingWizards.previousStep;
                settingWizards.currentStep.nestedSteps[1].isCompleted = false;
                settingWizards.currentStep.isCompleted = false;
+               settingWizards.previousStep = previousStep;
+               settingWizards.nextStep = settingWizardSteps[3];
                settingWizard.updateSettingWizard(settingWizards, function (err, data) {
                    if (err) {
                        callback(err,null);
@@ -186,19 +195,10 @@ settingsService.trackSettingWizard = function trackSettingWizard(id,orgId,callba
                 callback(err, null);
                 return;
             }
-            if (settingWizards.currentStep.name === 'Provider Configuration'
-                && settingWizards.currentStep.nestedSteps[0].isCompleted === false) {
-                var settingWizardSteps = appConfig.settingWizardSteps;
-                var previousStep = settingWizardSteps[1];
-                previousStep.nestedSteps[0].isCompleted = true;
-                previousStep.nestedSteps[1].isCompleted = true;
-                previousStep.nestedSteps[2].isCompleted = true;
-                previousStep.isCompleted = true;
-                settingWizards.currentStep = settingWizards.previousStep;
-                settingWizards.currentStep.nestedSteps[2].isCompleted = false;
+            if (settingWizards.currentStep.name === 'User Configuration'
+                && settingWizards.currentStep.nestedSteps[1].isCompleted === false) {
+                settingWizards.currentStep.nestedSteps[0].isCompleted = false;
                 settingWizards.currentStep.isCompleted = false;
-                settingWizards.previousStep = previousStep;
-                settingWizards.nextStep = settingWizardSteps[3];
                 settingWizard.updateSettingWizard(settingWizards, function (err, data) {
                     if (err) {
                         callback(err,null);
@@ -211,17 +211,45 @@ settingsService.trackSettingWizard = function trackSettingWizard(id,orgId,callba
                 return;
             }
         })
-    }else if(id === '26'){
+    }else if(id === '7'){
+       settingWizard.getSettingWizardByOrgId(orgId,function(err,settingWizards) {
+           if (err) {
+               callback(err, null);
+               return;
+           }
+           if (settingWizards.currentStep.name === 'Provider Configuration'
+               && settingWizards.currentStep.nestedSteps[0].isCompleted === false) {
+               var settingWizardSteps = appConfig.settingWizardSteps;
+               var previousStep = settingWizardSteps[2];
+               previousStep.nestedSteps[0].isCompleted = true;
+               previousStep.nestedSteps[1].isCompleted = true;
+               previousStep.isCompleted = true;
+               settingWizards.currentStep = settingWizards.previousStep;
+               settingWizards.currentStep.nestedSteps[1].isCompleted = false;
+               settingWizards.currentStep.isCompleted = false;
+               settingWizards.previousStep = previousStep;
+               settingWizards.nextStep = settingWizardSteps[4];
+               settingWizard.updateSettingWizard(settingWizards, function (err, data) {
+                   if (err) {
+                       callback(err,null);
+                       return;
+                   }
+                   callback(null,data);
+               });
+           }else{
+               callback(null,settingWizards);
+               return;
+           }
+       })
+   }else if(id === '26'){
        settingWizard.getSettingWizardByOrgId(orgId,function(err,settingWizards) {
            if (err) {
                callback(err, null);
                return;
            }
            if (settingWizards.currentStep.name === 'Devops Roles'
-               && settingWizards.currentStep.nestedSteps[0].isCompleted === true) {
+               && settingWizards.currentStep.nestedSteps[1].isCompleted === false) {
                settingWizards.currentStep.nestedSteps[0].isCompleted = false;
-               settingWizards.currentStep.nestedSteps[1].isCompleted = false;
-               settingWizards.currentStep.nestedSteps[2].isCompleted = false;
                settingWizard.updateSettingWizard(settingWizards, function (err, data) {
                    if (err) {
                        callback(err,null);
@@ -241,10 +269,8 @@ settingsService.trackSettingWizard = function trackSettingWizard(id,orgId,callba
                return;
            }
            if (settingWizards.currentStep.name === 'Devops Roles'
-               && settingWizards.currentStep.nestedSteps[1].isCompleted === true) {
-               settingWizards.currentStep.nestedSteps[0].isCompleted = true;
+               && settingWizards.currentStep.nestedSteps[2].isCompleted === false) {
                settingWizards.currentStep.nestedSteps[1].isCompleted = false;
-               settingWizards.currentStep.nestedSteps[2].isCompleted = false;
                settingWizard.updateSettingWizard(settingWizards, function (err, data) {
                    if (err) {
                        callback(err,null);
@@ -263,10 +289,10 @@ settingsService.trackSettingWizard = function trackSettingWizard(id,orgId,callba
                callback(err, null);
                return;
            }
-           if (settingWizards.currentStep.name === 'CMDB Configuration'
-               && settingWizards.currentStep.isCompleted === false) {
+           if (settingWizards.currentStep.name === 'Wizard Status'
+               && settingWizards.currentStep.isCompleted === true) {
                var settingWizardSteps = appConfig.settingWizardSteps;
-               var previousStep = settingWizardSteps[4];
+               var previousStep = settingWizardSteps[5];
                previousStep.nestedSteps[0].isCompleted = true;
                previousStep.nestedSteps[1].isCompleted = true;
                previousStep.nestedSteps[2].isCompleted = true;
@@ -275,7 +301,7 @@ settingsService.trackSettingWizard = function trackSettingWizard(id,orgId,callba
                settingWizards.currentStep.nestedSteps[2].isCompleted = false;
                settingWizards.currentStep.isCompleted = false;
                settingWizards.previousStep = previousStep;
-               settingWizards.nextStep = settingWizardSteps[6];
+               settingWizards.nextStep = {name:'Wizard Status',isCompleted:true};
                settingWizard.updateSettingWizard(settingWizards, function (err, data) {
                    if (err) {
                        callback(err,null);
@@ -295,7 +321,7 @@ settingsService.trackSettingWizard = function trackSettingWizard(id,orgId,callba
                return;
            }
            if (settingWizards.currentStep.name === 'Gallery Setup'
-               && settingWizards.nestedSteps[0].isCompleted === true) {
+               && settingWizards.nestedSteps[1].isCompleted === false) {
                settingWizards.nestedSteps[0].isCompleted = false;
                settingWizard.updateSettingWizard(settingWizards, function (err, data) {
                    if (err) {
@@ -316,7 +342,7 @@ settingsService.trackSettingWizard = function trackSettingWizard(id,orgId,callba
                return;
            }
            if (settingWizards.currentStep.name === 'Gallery Setup'
-               && settingWizards.nestedSteps[1].isCompleted === true) {
+               && settingWizards.nestedSteps[2].isCompleted === false) {
                settingWizards.nestedSteps[1].isCompleted = false;
                settingWizard.updateSettingWizard(settingWizards, function (err, data) {
                    if (err) {
@@ -339,7 +365,6 @@ settingsService.trackSettingWizard = function trackSettingWizard(id,orgId,callba
            if (settingWizards.currentStep.name === 'Provider Configuration'
                && settingWizards.currentStep.nestedSteps[1].isCompleted === false) {
                settingWizards.currentStep.nestedSteps[0].isCompleted = false;
-               settingWizards.currentStep.nestedSteps[1].isCompleted = false;
                settingWizard.updateSettingWizard(settingWizards, function (err, data) {
                    if (err) {
                        callback(err,null);
@@ -361,7 +386,7 @@ settingsService.trackSettingWizard = function trackSettingWizard(id,orgId,callba
            if (settingWizards.currentStep.name === 'Gallery Setup'
                && settingWizards.currentStep.nestedSteps[0].isCompleted === false) {
                var settingWizardSteps = appConfig.settingWizardSteps;
-               var previousStep = settingWizardSteps[2];
+               var previousStep = settingWizardSteps[3];
                previousStep.nestedSteps[0].isCompleted = true;
                previousStep.nestedSteps[1].isCompleted = true;
                previousStep.isCompleted = true;
@@ -390,7 +415,7 @@ settingsService.trackSettingWizard = function trackSettingWizard(id,orgId,callba
            }
            if (settingWizards.currentStep.name === 'Devops Roles' && settingWizards.currentStep.nestedSteps[0].isCompleted === false) {
                var settingWizardSteps = appConfig.settingWizardSteps;
-               var previousStep = settingWizardSteps[3];
+               var previousStep = settingWizardSteps[4];
                previousStep.nestedSteps[0].isCompleted = true;
                previousStep.nestedSteps[1].isCompleted = true;
                previousStep.isCompleted = true;
diff --git a/server/install.js b/server/install.js
index 29fbb7b9e..0596ff667 100755
--- a/server/install.js
+++ b/server/install.js
@@ -70,11 +70,11 @@ function getDefaultsConfig() {
         settingWizardSteps:[{name :'Introduction',isCompleted:true},
             {name :'Org Configuration',isCompleted:false,mandatoryCheck:true,nestedSteps:[{name:'Organization',isCompleted:false,mandatoryCheck:true},
                 {name :'BusinessGroup',isCompleted:false,mandatoryCheck:true},{name:'Project',isCompleted:false,mandatoryCheck:true}]},
-            {name :'Config Management',isCompleted:false,mandatoryCheck:true,nestedSteps:[{name:'ChefServer',isCompleted:false,mandatoryCheck:true},{name:'Environment',isCompleted:false,mandatoryCheck:true},{name:'Teams',isCompleted:false,mandatoryCheck:true}]},
+            {name :'Config Management',isCompleted:false,mandatoryCheck:true,nestedSteps:[{name:'ChefServer',isCompleted:false,mandatoryCheck:true},{name:'Environment',isCompleted:false,mandatoryCheck:true}]},
+            {name :'User Configuration',isCompleted:false,mandatoryCheck:true,nestedSteps:[{name:'Team',isCompleted:false,mandatoryCheck:true},{name:'User',isCompleted:false,mandatoryCheck:true}]},
             {name :'Provider Configuration',isCompleted:false,mandatoryCheck:true,nestedSteps:[{name:'Provider',isCompleted:false,mandatoryCheck:true},{name:'VMImages',isCompleted:false,mandatoryCheck:true}]},
             {name :'Gallery Setup',isCompleted:false,mandatoryCheck:false,nestedSteps:[{name:'Templates',isCompleted:false,mandatoryCheck:false},{name:'ServiceCommand',isCompleted:false,mandatoryCheck:false},{name:'ScriptGallery',isCompleted:false,mandatoryCheck:false}]},
-            {name :'Devops Roles',isCompleted:false,mandatoryCheck:false,nestedSteps:[{name:'Nexus',isCompleted:false,mandatoryCheck:false},{name:'Docker',isCompleted:false,mandatoryCheck:false},{name:'Jenkins',isCompleted:false,mandatoryCheck:false}]},
-            {name :'CMDB Configuration',isCompleted:false,mandatoryCheck:false}
+            {name :'Devops Roles',isCompleted:false,mandatoryCheck:false,nestedSteps:[{name:'Nexus',isCompleted:false,mandatoryCheck:false},{name:'Docker',isCompleted:false,mandatoryCheck:false},{name:'Jenkins',isCompleted:false,mandatoryCheck:false}]}
         ],
         serviceControllerKey:'ZDQ2YWM3ZTUyZDhhZjhhOWRkMWQ2ZTc3NDhhNjk1OWEyYzgxZGJkMWVjYjA3ZThiZjY0NTBjYjBjMTM5YzA0Yg',
         serverControllerUrl:'stackstorm.rlcatalyst.com',
@@ -112,7 +112,8 @@ function getDefaultsConfig() {
                 "unassignedInstances":"state",
                 "chefNodes":"createdOn",
                 "blueprints":"name",
-                'compositeBlueprints':"name"
+                "compositeBlueprints":"name",
+                "containerLogs":"createdOn"
             },
             skip_Records : 1,
             max_record_limit : 200,
diff --git a/server/package.json b/server/package.json
index 7f3c7f548..1a23f28dd 100644
--- a/server/package.json
+++ b/server/package.json
@@ -73,7 +73,8 @@
         "events": "1.1.1",
         "moment": "2.14.1",
         "json2csv": "3.6.3",
-        "gridfs-stream":"1.1.1"
+        "gridfs-stream":"1.1.1",
+        "mongoose-double": "0.0.1"
     },
     "devDependencies": {
         "grunt": "0.4.5",