diff --git a/client/cat3/src/partials/sections/dashboard/workzone/workzoneCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/workzoneCtrl.js
index 1aeb745cd..ea3d09b80 100644
--- a/client/cat3/src/partials/sections/dashboard/workzone/workzoneCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/workzone/workzoneCtrl.js
@@ -87,7 +87,7 @@ function workzoneFunct($scope, $rootScope) {
 }
 angular.module('dashboard.workzone', ['angularTreeview', 'mgcrea.ngStrap', 'workzone.instance', 'workzone.blueprint', 'workzone.orchestration', 'workzone.container', 'workzone.cloudFormation', 'workzone.azureARM', 'workzone.application', 'apis.workzone', 'workzone.factories'])
 	.controller('workzoneCtrl', ['$scope', '$rootScope', workzoneFunct])
-	.controller('workzoneTreeCtrl', ['$rootScope', '$scope', 'workzoneServices', 'workzoneEnvironment', '$timeout', 'modulePermission', function ($rootScope, $scope, workzoneServices, workzoneEnvironment, $timeout, modulePerms) {
+	.controller('workzoneTreeCtrl', ['$rootScope', '$scope', 'workzoneServices', 'workzoneEnvironment', '$timeout', 'modulePermission', '$window', function ($rootScope, $scope, workzoneServices, workzoneEnvironment, $timeout, modulePerms, $window) {
 		'use strict';
 		//For showing menu icon in menu over breadcrumb without position flickering during load
 		$scope.isLoading = true;
@@ -135,7 +135,10 @@ angular.module('dashboard.workzone', ['angularTreeview', 'mgcrea.ngStrap', 'work
 				$('[data-nodetype="env"]').eq(0).click();	
 			}else{
 				if(modulePerms.settingsAccess()){
-					$scope.setWorkZoneMessage('NO_ENV_CONFIGURED_CONFIGURE_SETTINGS');
+					$window.location.href="/private/index.html#ajax/Settings/Dashboard.html";
+
+					//$location.path('/private/index.html#ajax/Settings/Dashboard.html');
+					//$scope.setWorkZoneMessage('NO_ENV_CONFIGURED_CONFIGURE_SETTINGS');
 				}
 				else{
 					$scope.setWorkZoneMessage('NO_ENV_CONFIGURED_NO_SETTINGS_ACCESS');	
diff --git a/client/htmls/private/ajax/Settings/ConfigCMDB.html b/client/htmls/private/ajax/Settings/ConfigCMDB.html
index 6898fe0d3..9d7430c86 100755
--- a/client/htmls/private/ajax/Settings/ConfigCMDB.html
+++ b/client/htmls/private/ajax/Settings/ConfigCMDB.html
@@ -1,25 +1,25 @@
-		<div class="row">
-			<div class="col-md-12">
-				<div class="col-md-12">
+        <div class="row">
+            <div class="col-md-12">
+                <div class="col-md-12">
               <form action="" id="configForm" autocomplete="off">
-					<div class="widget-box">
-						<div class="widget-header">
-							<h5 class="widget-title" style="color:#4e5964;">
-		                   		 <strong>ServiceNow CMDB Setting</strong>
-		                    </h5>
-						</div>
-				<div class="widget-body">
-					<div class="widget-main" style="min-height:300px;">
-                  		<div>
-                     		<section id="widget-grid" class="">
+                    <div class="widget-box">
+                        <div class="widget-header">
+                            <h5 class="widget-title" style="color:#4e5964;">
+                                 <strong>ServiceNow CMDB Setting</strong>
+                            </h5>
+                        </div>
+                <div class="widget-body">
+                    <div class="widget-main" style="min-height:300px;">
+                        <div>
+                            <section id="widget-grid" class="">
                         <!-- START ROW -->
-                        		<div class="row">             
+                                <div class="row">             
                               <!-- Widget ID (each widget will need unique ID)-->
-                              		<div class="jarviswidget" id="wid-id-3" data-widget-editbutton="false" data-widget-custombutton="false">
+                                    <div class="jarviswidget" id="wid-id-3" data-widget-editbutton="false" data-widget-custombutton="false">
                                  <!-- widget div-->
-                                 		<div>
+                                        <div>
                                     <!-- widget content -->
-                                    	<div class="widget-body no-padding">
+                                        <div class="widget-body no-padding">
                                        <div class="col-lg-6 col-md-6">
                                              <label for="configname">Configuration Name:<span class="control-label redSpan">&nbsp;*</span></label>
                                              <!-- <i class="icon-append fa fa-building"></i> -->
@@ -90,12 +90,12 @@ <h5 class="widget-title" style="color:#4e5964;">
                </div>
             </div>
 
-				</div>
-					</div>
+                </div>
+                    </div>
                </form><!--form ends-->
-				</div>
-			</div>
-		</div>
+                </div>
+            </div>
+        </div>
 
       <script >
 
diff --git a/client/htmls/private/ajax/Settings/CreateDockerTemplates.html b/client/htmls/private/ajax/Settings/CreateDockerTemplates.html
index e2c50489d..c93b032b1 100755
--- a/client/htmls/private/ajax/Settings/CreateDockerTemplates.html
+++ b/client/htmls/private/ajax/Settings/CreateDockerTemplates.html
@@ -47,6 +47,31 @@ <h4 class="widget-margin" style="color:black;">New Docker  <span id="spndocker">
                                           <label for="">Password: <span class="control-label redSpan">&nbsp;*</span></label>
                                           <input name="ctl00$MainContent$orgname" value="" id="dockerpassword" class="form-control" type="text"  cdata="catalyst" cat-validation="required" value="*********">
                                        </div>
+                                       <div class="col-lg-6 col-md-6 smart-form margintop20">
+                                    <label for="category">Assign Projects:</label>
+                                    <div id="projectname" multiselect="multiselect" datatype="select"  class="input-group from-control col-md-12" style="height:150px;overflow-y:auto;padding:2px;border:1px solid silver;width:100%" cdata="catalyst">
+                                    </div>
+                                </div>
+                                <div class="col-lg-6 col-md-6">
+                                          <a style="cursor:pointer;" data-toggle="modal" data-backdrop="false" id="repoanchorDetails" href="#repodetailsModal"> <img title="Add Repository Details" data-placement="top" rel="tooltip" class="addrepoDetails" style="float:right;margin-top:20px;" src="img/add.png"></a>
+                                          <label style="float:left;margin-top:20px;">Repositories Details :</label>
+                                          <div class="table-responsive table-div">
+                                            <table id="tablerepositoryDetails" class="table table-striped table-bordered table-hover dataTable" style="border:1px solid #eeeeee !important; text-align:center;font-size:12px;margin-top:45px;" width="100%" cellpadding="5px">
+                                                <thead>
+                                                    <tr class="rowCustomStyle" style="font-weight:bold;">
+                                                        <td style="color:#fff;background-color: #2c3742;">Name</td>
+                                                        <td style="color:#fff;background-color: #2c3742; width:10%">Action</td>
+                                                    </tr>
+                                                </thead>
+                                                <tbody id="repoDeployTbody">
+                                                </tbody>
+                                            </table>
+                                          </div>
+                                        </div>
+                                        <div class="col-lg-6 col-md-6" style="margin-top:25px; display:none">
+                                          <label for="name">Repository Details:</label>
+                                          <input autofocus name="ctl00$MainContent$orgname" value="" id="repositories" class="form-control" type="text"  cdata="catalyst">
+                                       </div>
                                     </div>
                                     <!-- end widget content -->
                                  </div>
@@ -78,61 +103,136 @@ <h4 class="widget-margin" style="color:black;">New Docker  <span id="spndocker">
    </div>
 </div>
 <!--row ends here-->
-
+<div class="modal fade" id="repodetailsModal" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="static">
+   <div class="modal-dialog">
+      <div class="modal-content">
+         <form class="" id="repoDetailsCreate" autocomplete="off">
+            <div class="modal-header">
+               <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
+               &times;
+               </button>
+               <h4 class="modal-title">
+                  <img style="width:18px;margin-left:6px;" src="img/tasksmall.png">&nbsp;&nbsp;Add Repository Details
+               </h4>
+            </div>
+            <div class="modal-body" style="height:150px;">
+               <div class="col-lg-6 col-md-6">
+                    <label for="">Repository Name:<span style="color:red">*</span>
+                    <span>
+                        <img class="reposerverspinner" src="img/select2-spinner.gif" style="display:none">
+                        </img>
+                    </span>
+                </label>
+                    <select id="repoNameCreate" name="" class="form-control">
+                        <option value="">Choose Repository</option>
+                    </select>
+                </div>
+            </div>
+            <div class="modal-footer">
+              <a type="button" class="btn btn-default" data-dismiss="modal">
+                <i class="ace-icon fa fa-times bigger-110" style="margin-right: 5px;"></i>Cancel
+              </a>
+              <button class="btn btn-primary btn-mini" id="saveRepoDetails">
+                <i class="ace-icon fa fa-check bigger-110"></i>
+                Save
+              </button>
+            </div>
+         </form>
+      </div>
+   </div>
+</div>
 <!--Popup for selecting a cloud provider before proceeding-->
 <script>
   $('#dockerrepoanchorDetails').click(function(e) {
     $("#dockerrepodetailsModal").show();
     $('#dockerrepoDetailsCreate').trigger("reset");
   });
-  if (!$.fn.dataTable.isDataTable('#tabledockerrepositoryDetails')) {
-    $repoDetails = $('#tabledockerrepositoryDetails').DataTable({
-      "pagingType": "full_numbers",
-      "iDisplayLength": 5,
-      "aLengthMenu": [
-        [5, 40, 100, -1],
-        [5, 40, 100, "All"]
-      ],
-      "aoColumns": [{
-        "bSortable": true
-      }, {
-        "bSortable": true
-      }]
-    });
-  }
-  $("#tabledockerrepositoryDetails_length").hide();
-  $("#tabledockerrepositoryDetails_filter").hide();
-
-  $("#savedockerRepoDetails").click(function(e) {
-    e.preventDefault();
-    var repoName = $("#dockerrepoNameCreate").val();
-    var regExpSymbol = new RegExp("/");
-    if (repoName == '') {
-      alert("Please Enter Docker Repository Name");
-    } else if (repoName != '' && repoName.match(regExpSymbol)) {
-      var $repoDeployTbody = $('#dockerrepoDeployTbody');
-      var $tr = $('<tr class="dockerrepoDetailsRow"></tr>');
-      var $tdName = $('<td class="tddockerrepoName" value=' + repoName + ' style="word-break: break-word;"></td>');
-      $tr.attr('dockerrepoName', 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>');
-
-      $tdAction.find('.deleteRow').click(function() {
-        $repoDetails.row($tr).remove().draw(true);
-      });
+  
+  if (!$.fn.dataTable.isDataTable('#tablerepositoryDetails')) {
+      $repoDetails = $('#tablerepositoryDetails').DataTable({
+           "pagingType": "full_numbers",
+           "iDisplayLength": 5,
+           "aLengthMenu": [
+               [5, 40, 100, -1],
+               [5, 40, 100, "All"]
+           ],
+           "aoColumns": [
+               {
+                   "bSortable": true
+               }, {
+                   "bSortable": true
+               }
+           ]
+       });
+   }
+   $("#tablerepositoryDetails_length").hide();
+   $("#tablerepositoryDetails_filter").hide();
 
-      $tr.append($tdName).append($tdAction);
-      $repoDeployTbody.append($tr);
-      $repoDetails.row.add($tr).draw();
-      $("#dockerrepodetailsModal").hide();
-    } else {
-      bootbox.alert("Please Enter Correct Format of the Docker Repository Name");
-    }
+  $('#repoanchorDetails').click(function(e){
+      getDockerRepositories();
   });
+  
+  function getDockerRepositories(){
+    $('.reposerverspinner').css('display', 'inline-block');
+    $('#repoNameCreate').select2('destroy').empty();
+    $('#repoNameCreate').append('<option value = "" > Choose Repository </option>');
+      $.get('/d4dMasters/readmasterjsonnew/17',function(templates){
+        if(templates.length){
+          $('.reposerverspinner').css('display', 'none');
+          for(var i=0; i< templates.length; i++){
+            if(templates[i].dockercontainerpaths){
+              $('#repoNameCreate').append('<option value='+templates[i].dockercontainerpaths+'>'+templates[i].dockercontainerpaths+'</option>');
+            }
+          }
+        } else {
+          $('.reposerverspinner').css('display', 'none');
+        }
+      });
+   }
+
+  $("#saveRepoDetails").click(function(e) {
+
+     e.preventDefault();
+     var repoServerName = $("#chooseRepoServer").val();
+     var repoName = $("#repoNameCreate").val();
+     if (repoName == '') {
+         alert("Please enter Repository Name");
+     }
+     if (repoName != '') {
+         var $repoDeployTbody = $('#repoDeployTbody');
+         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>');
 
+         $tdAction.find('.deleteRow').click(function() {
+             $repoDetails.row($tr).remove().draw(true);
+         });
+
+         $tr.append($tdName).append($tdAction);
+         $repoDeployTbody.append($tr);
+         $repoDetails.row.add($tr).draw();
+         $("#repodetailsModal").hide();
+     }
+     $("#repoNameCreate").empty();
+     $('#repoNameCreate').append('<option value = "" > Choose Repository </option>');
+   });
+  
+  $("#savecreateDockerbtn").click(function(e) {
+        var repositories = {
+          docker: []
+        };
+        var dockerList = [];
+        var tableData = $repoDetails.data();
+        for(var i=0; i< tableData.length;i++){
+            dockerList.push(tableData[i][0]);
+        }
+        repositories.docker = dockerList;
+        $('#repositories').val(JSON.stringify(repositories));
+    });
   //Form Name
   function cancelClicked() {
     $("#popupSelectProvider").modal('hide');
@@ -167,6 +267,20 @@ <h4 class="widget-margin" style="color:black;">New Docker  <span id="spndocker">
 
   }
 
+  $('#orgname').change(function() {
+       $('#projectname').empty();
+        $.get('/d4dMasters/readmasterjsonnew/4', function(data) {
+           for (var i = 0; i < data.length; i++) {
+                   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>';
+                       };
+                   str = str + getTemplate(data[i].projectname, data[i].rowid);
+                   $('#projectname').append(str);
+           }
+       });
+    });
+
   function inLineReady() {
 
     $("input[type='text']").on("click", function() {
diff --git a/client/htmls/private/ajax/Settings/CreateNexusServer.html b/client/htmls/private/ajax/Settings/CreateNexusServer.html
index 97fd4506d..21f5d99fc 100755
--- a/client/htmls/private/ajax/Settings/CreateNexusServer.html
+++ b/client/htmls/private/ajax/Settings/CreateNexusServer.html
@@ -70,6 +70,31 @@ <h4 class="widget-margin" style="color:black;">Nexus Configuration Management  <
                                        <label for="name">Nexus Group ID Details:</label>
                                        <input autofocus name="ctl00$MainContent$orgname" value="" id="groupid" class="form-control" type="text"  cdata="catalyst">
                                     </div>
+                                    <div class="col-lg-6 col-md-6 smart-form margintop20">
+                                    <label for="category">Assign Projects:</label>
+                                    <div id="projectname" multiselect="multiselect" datatype="select"  class="input-group from-control col-md-12" style="height:150px;overflow-y:auto;padding:2px;border:1px solid silver;width:100%" cdata="catalyst">
+                                    </div>
+                                </div>
+                                <div class="col-lg-6 col-md-6">
+                                          <a style="cursor:pointer;" data-toggle="modal" data-backdrop="false" id="repoanchorDetails" href="#repodetailsModal"> <img title="Add Repository Details" data-placement="top" rel="tooltip" class="addrepoDetails" style="float:right;margin-top:20px;" src="img/add.png"></a>
+                                          <label style="float:left;margin-top:20px;">Repositories Details :</label>
+                                          <div class="table-responsive table-div">
+                                            <table id="tablerepositoryDetails" class="table table-striped table-bordered table-hover dataTable" style="border:1px solid #eeeeee !important; text-align:center;font-size:12px;margin-top:45px;" width="100%" cellpadding="5px">
+                                                <thead>
+                                                    <tr class="rowCustomStyle" style="font-weight:bold;">
+                                                        <td style="color:#fff;background-color: #2c3742;">Name</td>
+                                                        <td style="color:#fff;background-color: #2c3742; width:10%">Action</td>
+                                                    </tr>
+                                                </thead>
+                                                <tbody id="repoDeployTbody">
+                                                </tbody>
+                                            </table>
+                                          </div>
+                                        </div>
+                                        <div class="col-lg-6 col-md-6" style="margin-top:25px; display:none">
+                                          <label for="name">Repository Details:</label>
+                                          <input autofocus name="ctl00$MainContent$orgname" value="" id="repositories" class="form-control" type="text"  cdata="catalyst">
+                                       </div>
                                  </div>
                               </div>
                            </div>
@@ -131,6 +156,45 @@ <h4 class="modal-title">
       </div>
    </div>
 </div>
+<!--modal for Repo Deploy Details-->
+<div class="modal fade" id="repodetailsModal" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="static">
+   <div class="modal-dialog">
+      <div class="modal-content">
+         <form class="" id="repoDetailsCreate" autocomplete="off">
+            <div class="modal-header">
+               <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
+               &times;
+               </button>
+               <h4 class="modal-title">
+                  <img style="width:18px;margin-left:6px;" src="img/tasksmall.png">&nbsp;&nbsp;Add Repository Details
+               </h4>
+            </div>
+            <div class="modal-body" style="height:150px;">
+               <div class="col-lg-6 col-md-6">
+                    <label for="">Repository Name:<span style="color:red">*</span>
+                    <span>
+                        <img class="reposerverspinner" src="img/select2-spinner.gif" style="display:none">
+                        </img>
+                    </span>
+                </label>
+                    <select id="repoNameCreate" name="" class="form-control">
+                        <option value="">Choose Repository</option>
+                    </select>
+                </div>
+            </div>
+            <div class="modal-footer">
+              <a type="button" class="btn btn-default" data-dismiss="modal">
+                <i class="ace-icon fa fa-times bigger-110" style="margin-right: 5px;"></i>Cancel
+              </a>
+              <button class="btn btn-primary btn-mini" id="saveRepoDetails">
+                <i class="ace-icon fa fa-check bigger-110"></i>
+                Save
+              </button>
+            </div>
+         </form>
+      </div>
+   </div>
+</div>
 <!--Popup for selecting a cloud provider before proceeding-->
 <script>
    //Form Name
@@ -172,8 +236,79 @@ <h4 class="modal-title">
          }
        });
      }
+     if (!$.fn.dataTable.isDataTable('#tablerepositoryDetails')) {
+      $repoDetails = $('#tablerepositoryDetails').DataTable({
+           "pagingType": "full_numbers",
+           "iDisplayLength": 5,
+           "aLengthMenu": [
+               [5, 40, 100, -1],
+               [5, 40, 100, "All"]
+           ],
+           "aoColumns": [
+               {
+                   "bSortable": true
+               }, {
+                   "bSortable": true
+               }
+           ]
+       });
+   }
+   $("#tablerepositoryDetails_length").hide();
+   $("#tablerepositoryDetails_filter").hide();
    });
 
+  $('#repoanchorDetails').click(function(e){
+      getNexusRepoDetails();
+  });
+   //nexus/userName/:userName/nexusPassword/:nexusPassword/hostName/:hostName/repositories
+   function getNexusRepoDetails() {
+    var nexusUserName,nexusPassword,nexusHostName; 
+    var $form = $('#myForm101');
+    nexusUserName = $form.find('#username').val();
+    nexusPassword = $form.find('#nexuspassword').val();
+    nexusHostName = $form.find('#hostname').val();
+    $('#repoNameCreate').empty();
+    $('#repoNameCreate').append('<option value = "" > Choose Repository </option>');
+        $.get('/nexus/userName/' + nexusUserName + '/nexusPassword/' + nexusPassword + '/repositories?hostName=' + nexusHostName, function(nexusRepos) {
+            $('.reposerverspinner').css('display', 'none');
+            if (nexusRepos.length) {
+              for (var i = 0; i < nexusRepos.length; i++) {
+                $('#repoNameCreate').append('<option data-repoName="' + nexusRepos[i].name + '" value="' + nexusRepos[i].id + '">' + nexusRepos[i].name + '</option>');
+              }
+            }
+        });
+   }
+
+   $("#saveRepoDetails").click(function(e) {
+
+     e.preventDefault();
+     var repoServerName = $("#chooseRepoServer").val();
+     var repoName = $("#repoNameCreate").val();
+     if (repoName == '') {
+         alert("Please enter Repository Name");
+     }
+     if (repoName != '') {
+         var $repoDeployTbody = $('#repoDeployTbody');
+         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>');
+
+         $tdAction.find('.deleteRow').click(function() {
+             $repoDetails.row($tr).remove().draw(true);
+         });
+
+         $tr.append($tdName).append($tdAction);
+         $repoDeployTbody.append($tr);
+         $repoDetails.row.add($tr).draw();
+         $("#repodetailsModal").hide();
+     }
+     $("#repoNameCreate").empty();
+     $('#repoNameCreate').append('<option value = "" > Choose Repository </option>');
+   });
    $('#nexusGroupAnchorDetails').click(function(e) {
      $("#nexusGroupDetailsModal").modal('show');
      $('#nexusGroupDetailsCreate').trigger("reset");
@@ -245,6 +380,19 @@ <h4 class="modal-title">
      });
    }
 
+   $("#savecreateNexusServerBtn").click(function(e) {
+        var repositories = {
+          nexus: []
+        };
+        var nexusList = [];
+        var tableData = $repoDetails.data();
+        for(var i=0; i< tableData.length;i++){
+            nexusList.push(tableData[i][0]);
+        }
+        repositories.nexus = nexusList;
+        $('#repositories').val(JSON.stringify(repositories));
+    });
+
    function inLineReady() {
 
      $("input[type='text']").on("click", function() {
@@ -283,6 +431,19 @@ <h4 class="modal-title">
    inLineReady();
 </script>
 <script>
+$('#orgname').change(function(e){
+    $.get('/d4dMasters/readmasterjsonnew/4', function(data) {
+           for (var i = 0; i < data.length; i++) {
+                   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>';
+                       };
+                   str = str + getTemplate(data[i].projectname, data[i].rowid);
+                   $('#projectname').append(str);
+               
+           }
+       });
+});
 
 $(document).ready(function() {
   $("#nexusservername").focus();
diff --git a/client/htmls/private/ajax/Settings/CreateProject.html b/client/htmls/private/ajax/Settings/CreateProject.html
index 999294904..ed24b5940 100755
--- a/client/htmls/private/ajax/Settings/CreateProject.html
+++ b/client/htmls/private/ajax/Settings/CreateProject.html
@@ -54,56 +54,6 @@ <h4 class="widget-margin" style="color:black;">Create Project</h4>
                                           <div  id="environmentname" multiselect="multiselect" datatype="select" sourcepath="3" datapath="masterjson.rows.row"  linkedto="orgname" class="input-group from-control col-md-12 widthBox" cdata="catalyst">
                                           </div>
                                         </div>
-                                        <div class="col-lg-6 col-md-6">
-                                          <a style="cursor:pointer;" data-toggle="modal" data-backdrop="false" id="repoanchorDetails" href="#repodetailsModal"> <img title="Add Repository Details" data-placement="top" rel="tooltip" class="addrepoDetails" style="float:right;margin-top:20px;" src="img/add.png"></a>
-                                          <label style="float:left;margin-top:20px;">Repositories Details :</label>
-                                          <div class="table-responsive table-div">
-                                            <table id="tablerepositoryDetails" class="table table-striped table-bordered table-hover dataTable" style="border:1px solid #eeeeee !important; text-align:center;font-size:12px;margin-top:45px;" width="100%" cellpadding="5px">
-                                                <thead>
-                                                    <tr class="rowCustomStyle" style="font-weight:bold;">
-                                                        <td style="color:#fff;background-color: #2c3742; width:35%">Repository</td>
-                                                        <td style="color:#fff;background-color: #2c3742;">Name</td>
-                                                        <td style="color:#fff;background-color: #2c3742; width:10%">Action</td>
-                                                    </tr>
-                                                </thead>
-                                                <tbody id="repoDeployTbody">
-                                                </tbody>
-                                            </table>
-                                          </div>
-                                        </div>
-                                        <div class="col-lg-6 col-md-6" style="margin-top:25px; display:none">
-                                          <label for="name">Repository Details:</label>
-                                          <input autofocus name="ctl00$MainContent$orgname" value="" id="repositories" class="form-control" type="text"  cdata="catalyst">
-                                       </div>
-                                        <!-- <div class="col-lg-6 col-md-6" style="display:none">
-                                          <a style="cursor:pointer;" data-toggle="modal" data-backdrop="false" id="appanchorDetails" href="#appdetailsModal"> <img title="Add App Details" data-placement="top" rel="tooltip" class="addappDetails" style="float:right;margin-top:20px;" src="img/add.png"></a>
-                                          <label style="float:left;margin-top:20px;">Application Details :</label>
-                                          <div class="table-responsive table-div">
-                                            <table id="tableappDetails" class="table table-striped table-bordered table-hover dataTable envAppDeployTable" style="border:1px solid #eeeeee !important; text-align:center;font-size:12px;margin-top:45px;" width="100%" cellpadding="5px">
-                                                <thead>
-                                                    <tr class="rowCustomStyle" style="font-weight:bold;">
-                                                        <td style="color:#fff;background-color: #2c3742;">App Name</td>
-                                                        <td style="color:#fff;background-color: #2c3742;">App Description</td>
-                                                        <td style="color:#fff;background-color: #2c3742;">Action</td>
-                                                    </tr>
-                                                </thead>
-                                                <tbody id="appDeployTbody">
-                                                </tbody>
-                                            </table>
-                                          </div>
-                                        </div> -->
-                                        <!-- <div class="col-lg-6 col-md-6" style="margin-top:25px; display:none">
-                                          <label for="name">Application Name:</label>
-                                          <input autofocus name="ctl00$MainContent$orgname" value="" id="appdeploy" class="form-control" type="text"  cdata="catalyst">
-                                       </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 id="teamname" multiselect="multiselect" datatype="select" datapath="masterjson.rows.row" class="input-group from-control col-md-12 widthBox"  sourcepath="21" cdata="catalyst" linkedto="orgname" cat-validation="onechecked">
-                                    </div>
-                                </div> -->
-                                 
-                                 
                                  <!-- end widget content -->
                                  </div>
                               </div>
@@ -135,70 +85,6 @@ <h4 class="widget-margin" style="color:black;">Create Project</h4>
       </div>
    </div>
 </div>
-
-<!--modal for Repo Deploy Details-->
-<div class="modal fade" id="repodetailsModal" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="static">
-   <div class="modal-dialog">
-      <div class="modal-content">
-         <form class="" id="repoDetailsCreate" autocomplete="off">
-            <div class="modal-header">
-               <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
-               &times;
-               </button>
-               <h4 class="modal-title">
-                  <img style="width:18px;margin-left:6px;" src="img/tasksmall.png">&nbsp;&nbsp;Add Repository Details
-               </h4>
-            </div>
-            <div class="modal-body" style="height:150px;">
-              <div class="col-lg-6 col-md-6">
-                <label for="">Repository Server:<span style="color:red">*</span>
-                    <!-- <span>
-                        <img class="reposerverspinner" src="img/select2-spinner.gif" style="display:none">
-                        </img>
-                    </span> -->
-                </label>
-                <div class="input-groups">
-                    <select id="chooseRepoServer" name="" class="required width-100 form-control">
-                        <option value="">Choose Server</option>
-                        <!-- <option value="nexus">Nexus</option>
-                        <option value="docker">Docker</option> -->
-                    </select>
-                </div>
-              </div>
-               <!-- <div class="col-lg-6 col-md-6">
-                  <label for="repoName">Name</label>
-                  <input type="text" name="repoName" class="form-control" id="repoNameCreate"/>
-               </div>
-               <div class="col-lg-12 col-md-12" style="margin-top:20px">
-                 
-                 <span style="color:red;font-size:12px">* For Docker repository name should be username/tag (e.g. relevancelab/catalyst)</span>
-               </div> -->
-
-               <div class="col-lg-6 col-md-6">
-                    <label for="">Repository Name:<span style="color:red">*</span>
-                    <span>
-                        <img class="reposerverspinner" src="img/select2-spinner.gif" style="display:none">
-                        </img>
-                    </span>
-                </label>
-                    <select id="repoNameCreate" name="" class="form-control">
-                        <option value="">Choose Repository</option>
-                    </select>
-                </div>
-            </div>
-            <div class="modal-footer">
-              <a type="button" class="btn btn-default" data-dismiss="modal">
-                <i class="ace-icon fa fa-times bigger-110" style="margin-right: 5px;"></i>Cancel
-              </a>
-              <button class="btn btn-primary btn-mini" id="saveRepoDetails">
-                <i class="ace-icon fa fa-check bigger-110"></i>
-                Save
-              </button>
-            </div>
-         </form>
-      </div>
-   </div>
-</div>
 <script>
    //Form Name
 
@@ -368,27 +254,7 @@ <h4 class="modal-title">
       $("#appdetailsModal").show();
       $('#appDetailsCreate').trigger("reset");
    });
-   if (!$.fn.dataTable.isDataTable('#tablerepositoryDetails')) {
-      $repoDetails = $('#tablerepositoryDetails').DataTable({
-           "pagingType": "full_numbers",
-           "iDisplayLength": 5,
-           "aLengthMenu": [
-               [5, 40, 100, -1],
-               [5, 40, 100, "All"]
-           ],
-           "aoColumns": [
-               {
-                   "bSortable": true
-               }, {
-                   "bSortable": true
-               }, {
-                   "bSortable": true
-               }
-           ]
-       });
-   }
-   $("#tablerepositoryDetails_length").hide();
-   $("#tablerepositoryDetails_filter").hide();
+   
 
    if (!$.fn.dataTable.isDataTable('#tableappDetails')) {
       $appDetails = $('#tableappDetails').DataTable({
@@ -412,39 +278,7 @@ <h4 class="modal-title">
    $("#tableappDetails_length").hide();
    $("#tableappDetails_filter").hide();
 
-   $("#saveRepoDetails").click(function(e) {
-
-     e.preventDefault();
-     var repoServerName = $("#chooseRepoServer").val();
-     var repoName = $("#repoNameCreate").val();
-     if (repoName == '') {
-         alert("Please enter Repository Name");
-     }
-     if (repoName != '') {
-         var $repoDeployTbody = $('#repoDeployTbody');
-         var $tr = $('<tr class="repoDetailsRow"></tr>');
-         var $tdName = $('<td class="tdrepoName" value=' + repoName + ' style="word-break: break-word;"></td>');
-         $tr.data('repoName', repoName);
-         var $tdrepoServerName = $('<td class="tdrepoServerName" value=' + repoServerName + ' style="word-break: break-word;"></td>');
-         $tr.data('repoServerName', repoServerName);
-
-         $tdName.append(repoName);
-         $tdrepoServerName.append(repoServerName);
-         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($tdrepoServerName).append($tdName).append($tdAction);
-         $repoDeployTbody.append($tr);
-         $repoDetails.row.add($tr).draw();
-         $("#repodetailsModal").hide();
-     }
-     $("#repoNameCreate").empty();
-     $('#repoNameCreate').append('<option value = "" > Choose Repository </option>');
-   });
+   
     $("#savecreateProjectbtn").click(function(e) {
         var repositories = {
           nexus: [],
diff --git a/client/htmls/private/ajax/Settings/Dashboard.html b/client/htmls/private/ajax/Settings/Dashboard.html
index 9406e72cd..e497e6d46 100755
--- a/client/htmls/private/ajax/Settings/Dashboard.html
+++ b/client/htmls/private/ajax/Settings/Dashboard.html
@@ -1,331 +1,221 @@
-<style>
-    .container {
-        width:1166px;
-        height:130px;
-        margin-top: 20px;
-    }
-    .btn-circle {
-        width: 49px;
-        height: 49px;
-        text-align: center;
-        padding: 5px 0;
-        font-size: 20px;
-        line-height: 2.00;
-        border-radius: 30px;
-        margin: 0 25px;
-    }
-
-    .btn-text {
-        font-size: 12px;
-        vertical-align: middle
-    }
-
-    .btn:hover {
-        font-weight: bold;
-        color: #fff;
-    }
-
-    .active-btn {
-        background-color: #286090;
-        color:#fff;
-        box-shadow: 0 0 5px #286090;
-    }
-    .green-btn {
-        background-color: green;
-        color:#fff;
-        box-shadow: 0 0 5px #286090;
-    }
-    .red-btn {
-        background-color: red;
-        color:#fff;
-        box-shadow: 0 0 5px #286090;
-    }
-    .process-btn {
-        background-color: #7d7676;
-        color: #fff;
-        box-shadow: 0 0 5px #888888;
-    }
-
-    .end-btn {
-        background-color: #40BAF1;
-        color: #fff;
-        box-shadow: 0 0 5px #40BAF1;
-    }
-
-    ul li {
-        text-decoration: none;
-        display: inline;
-    }
-
-    .li-margin {
-        margin:0 20px;
-        width: 30px;
-    }
-
-    .btn-cls {
-        margin: 10px auto;
-        width: 90%;
-        background: hsla(0, 0%, 0%, 0) url("../../private/img/dot.jpg") no-repeat scroll -27px 25px;
-        height: 45px;
-    }
-
-    .btn-1 {
-        float: left;
-        width: 126px;
-        text-align: center;
-
-        padding: 0 15px;
-    }
-
-    .lable-name {
-        padding-top: 10px;
-        color: #7d7676;
-    }
-
-    .form-controls {
-        display: inline;
-        height: 32px;
-        padding: 6px 12px;
-        font-size: 13px;
-        line-height: 1.428571429;
-        color: #555;
-        vertical-align: middle;
-        background-color: #fff;
-        background-image: none;
-        border: 1px solid #ccc;
-        transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
-        height: 29px;
-    }
-
-    .marginRight20 {
-        margin-right: 20px;
-    }
-
-    #wizardActionListLoader {
-        opacity: 0.6;
-        height: 100%;
-        width: 100%;
-        position: absolute;
-        background: #ddd;
-    }
-</style>
 <div class="row">
-    <div id="wizardActionListLoader" 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="widget-box">
-        <div class="widget-header">
-            <h5 class="widget-title" style="color:#4e5964;">
-                <strong>Setup &amp; Configuration Wizard</strong>
-            </h5>
-            <div class="widget-toolbar no-border">
-                        <span class="providerSelect">
-                            Choose Organization:
-                            <select class="form-controls marginRight20 orgWidth" id ="orgDropdown">
-                            </select>
-                        </span>
-                <a id="createNew" class="btn btn-primary">
-                    <i class="ace-icon ace-icon fa fa-plus bigger-110"></i>
-                    New Wizard
-                </a>
-
+   <div id="wizardActionListLoader" 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="widget-box">
+      <div class="widget-header">
+         <h5 class="widget-title" style="color:#4e5964;">
+            <strong>Setup &amp; Configuration Wizard</strong>
+         </h5>
+         <div class="widget-toolbar no-border">
+            <span class="providerSelect">Choose Organization:
+            <select class="wizardFormControls marginRight20 orgWidth" id ="orgDropdown">
+            </select>
+            </span>
+            <a id="cancelWizard" class="hidden btn btn-default">
+            <i class="ace-icon fa fa-times bigger-110"></i>Cancel Wizard
+            </a>
+            <a id="createNew" class="btn btn-primary">
+            <i class="ace-icon ace-icon fa fa-plus bigger-110"></i> New OrgSetup
+            </a>
+         </div>
+      </div>
+      <div id="wizardContainer" class="wizardContainer">
+         <div class="btn-cls">
+            <div class="btn-1" id="startConfig">
+               <a type="button" href="ajax/Settings/wizardIntro.html" class="btn wizardbtn-circle wizardbtn-text">Start</a><br />
+               <p class="wizardLabelName">Introduction</p>
             </div>
-        </div>
-        <div class="container">
-            <div class="btn-cls">
-                <div class="btn-1" id="startConfig">
-                    <a type="button" class="btn btn-circle btn-text" style="line-height:3">Start</a><br />
-                    <p class="lable-name">Introduction</p>
-                </div>
-                <div class="btn-1" id="orgConfiguration">
-                    <a type="button" href="ajax/Settings/settingsWizard.html" class="btn btn-circle process-btn">1</a><br />
-                    <p class="lable-name">Org Configuration</p>
-                </div>
-                <div class="btn-1" id="configManagement">
-                    <a type="button" href="ajax/Settings/configManagementWizard.html" class="btn btn-circle process-btn">2</a><br />
-                    <p class="lable-name">Config Management</p>
-                </div>
-                <div class="btn-1" id="providerConfiguration">
-                    <a type="button" href="ajax/Settings/providerWizard.html" class="btn btn-circle process-btn">3</a><br />
-                    <p class="lable-name">Provider Configuration</p>
-                </div>
-                <div class="btn-1" id="devopsConfiguration">
-                    <a type="button" href="ajax/Settings/devopsRolesWizard.html" class="btn btn-circle process-btn">4</a><br />
-                    <p class="lable-name">Devops Roles</p>
-                </div>
-                <div class="btn-1" id="trackConfiguration">
-                    <a type="button" href="ajax/Settings/trackWizard.html" class="btn btn-circle process-btn">5</a><br />
-                    <p class="lable-name">Track</p>
-                </div>
-                <div class="btn-1">
-                    <a type="button" href="ajax/Settings/cmdbWizard.html" class="btn btn-circle process-btn">6</a><br />
-                    <p class="lable-name">CMDB Configuration</p>
-                </div>
+            <div class="btn-1" id="orgConfiguration">
+               <a type="button" href="ajax/Settings/settingsWizard.html" class="btn wizardbtn-circle process-btn">1</a><br />
+               <p class="wizardLabelName">Org Configuration</p>
             </div>
-        </div>
-    </div>
-    <hr/>
-    <div class="contentSetting">
-    </div>
+            <div class="btn-1" id="configManagement">
+               <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="providerConfiguration">
+               <a type="button" href="ajax/Settings/providerWizard.html" class="btn wizardbtn-circle process-btn">3</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 />
+               <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 />
+               <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>
+   <hr/>
+   <div class="contentSetting">
+   </div>
 </div>
 
 
 
 <script type="text/javascript">
-    var orgIdForSetup, orgNameForSetup;
-    //added for v3.0 - when navigating from v2.0 workzone to settings-
-    $(document).ready(function() {
-        $('#wizardActionListLoader').show();
-        $("#content").attr('style', 'height: 100%!important')
-        if (isAngularIntegration) {
-            $('#workZoneNew').attr('href', '#');
-            $('#workZoneNew').removeClass('active');
-            $('#Workspace1').addClass('hidden');
-            $('#Settings_nav').show();
-            $('#settingsNew').addClass('active');
-            $("#ribbon ol.breadcrumb").empty();
-            $("#ribbon ol.breadcrumb").append($("<li>Settings</li>"));
+var orgIdForSetup, orgNameForSetup, bgNameForSetup;
+//added for v3.0 - when navigating from v2.0 workzone to settings-
+$(document).ready(function() {
+    $('#wizardActionListLoader').show();
+    $("#content").attr('style', 'height: 96%!important')
+    if (isAngularIntegration) {
+        $('#workZoneNew').attr('href', '#');
+        $('#workZoneNew').removeClass('active');
+        $('#Workspace1').addClass('hidden');
+        $('#Settings_nav').show();
+        $('#settingsNew').addClass('active');
+        $("#ribbon ol.breadcrumb").empty();
+        $("#ribbon ol.breadcrumb").append($("<li>Settings</li>"));
+    }
+    var hasCreatePermissionOrg = false;
+    if (haspermission('organization', 'create')) {
+        hasCreatePermissionOrg = true;
+    }
+
+    if (!hasCreatePermissionOrg) {
+        $('#createNew').addClass('hidden');
+    }
+    isUserTypeSuperAdmin();
+});
+
+function isUserTypeSuperAdmin() {
+    $.get('/d4dMasters/loggedInUser', function(data) {
+        if (!data.isSuperAdmin) {
+            $('#createNew').attr('disabled', 'disabled');
         }
     });
-    var serviceURL = "/d4dMasters/";
-    window.selectedOrgName = 'Settings';
-
-    drawBreadCrumb1();
-
-    $('.btn-1 a').click(function(e) {
-        $('a.btn').addClass('active-btn');
+}
+var serviceURL = "/d4dMasters/";
+window.selectedOrgName = 'Settings';
+var clicked = true;
+
+drawBreadCrumb1();
+//on click of button (top menu butons)
+$('.btn-1 a').click(function(e) {
+    e.preventDefault();
+    if($(this).attr('href')){
+        $(this).addClass('wizardActiveBtn').attr('href');
         $(this).removeClass('process-btn');
-        e.preventDefault();
         $('.contentSetting').load(this.getAttribute('href'));
-    });
-
-    function clearActiveClasses() {
-        //check for active one's
-        $('a.btn').removeClass('active-btn').addClass('process-btn');
-        //check for already created one's
-        $('a.btn').removeClass('green-btn').addClass('process-btn');
     }
-
-    $('#createNew').click(function(e) {
-        $('.providerSelect').addClass('hidden');
-        clearActiveClasses();
-        $('#startConfig a').addClass('green-btn').removeClass('process-btn');
-        $('#orgConfiguration a').addClass('active-btn').removeClass('process-btn');
-        $('#orgConfiguration a').trigger('click');
-
-    })
+});
+
+function clearActiveClasses() {
+    //check for active one's
+    $('a.btn').removeClass('wizardActiveBtn').addClass('process-btn');
+    //check for already created one's
+    $('a.btn').removeClass('green-btn').addClass('process-btn');
+    $('.wizardFlow').empty();
+}
+
+//on click of new button to create a new wizard..
+$('#createNew').click(function(e) {
+    $('#orgDropdown option:selected').val('');
+    $('.providerSelect').addClass('hidden');
+    $('#cancelWizard').removeClass('hidden');
+    $('#createNew').addClass('hidden');
+    clearActiveClasses();
+    $('#startConfig a').addClass('green-btn').removeClass('process-btn');
+    $('#orgConfiguration a').addClass('wizardActiveBtn').removeClass('process-btn');
     $('#orgConfiguration a').trigger('click');
-
-    $.get('/d4dMasters/readmasterjsonnew/1', function(data) {
-        $("#orgDropdown").empty();
-        for (var i = 0; i < data.length; i++) {
-            var $option = $('<option></option>').val(data[i].rowid).attr('rowid', data[i].orgname).html(data[i].orgname);
-            $('#orgDropdown').append($option);
-        }
-        $('#orgDropdown').change(function(e) {
-            $('#wizardActionListLoader').show();
-            clearActiveClasses();
-            orgIdForSetup = $("#orgDropdown").val();
-            changeWizardStatus(orgIdForSetup);
-            $('#wizardActionListLoader').hide();
-        });
-        $("#orgDropdown").trigger("change");
+});
+$('#orgConfiguration a').trigger('click');
+$.get('/d4dMasters/readmasterjsonnew/1', function(data) {
+    $("#orgDropdown").empty();
+    for (var i = 0; i < data.length; i++) {
+        var $option = $('<option></option>').val(data[i].rowid).attr('rowid', data[i].orgname).html(data[i].orgname);
+        $('#orgDropdown').append($option);
+    }
+    $('#orgDropdown').change(function(e) {
+        e.preventDefault();
+        $('#wizardActionListLoader').show();
+        clearActiveClasses();
+        orgIdForSetup = $("#orgDropdown").val();
+        changeWizardStatus(orgIdForSetup);
+        $('#wizardActionListLoader').hide();
     });
+    $("#orgDropdown").trigger("change");
 
-    function changeWizardStatus(orgIdForSetup) {
-        $('#wizardActionListLoader').show();
-        $.get('/setting-wizard/org/' + orgIdForSetup, function(data) {
-            if (data.length === 0) {
-                $('a.btn').addClass('active-btn');
-                $('#wizardActionListLoader').hide();
-            } else {
-                var isCompleted = data.previousStep.isCompleted;
-                if (isCompleted = 'true') {
-                    if (data.previousStep.name === 'Introduction') {
-                        $('#startConfig a').addClass('green-btn').removeClass('process-btn');
-                        $('#orgConfiguration a').addClass('active-btn').removeClass('process-btn');
-                        $('#orgConfiguration a').trigger('click');
-                        if(data.currentStep.nestedSteps){
-                            var nestedSteps = data.currentStep.nestedSteps;
-                            if(nestedSteps[0].name === 'Organization' && nestedSteps[0].isCompleted === true &&
-                                    nestedSteps[1].name === 'BusinessGroup' && nestedSteps[1].isCompleted === false){
-                                checkNestedSteps(true,false,false);
-                            }else if(nestedSteps[0].name === 'Organization' && nestedSteps[0].isCompleted === true &&
-                                    nestedSteps[1].name === 'BusinessGroup' && nestedSteps[1].isCompleted === true){
-                                checkNestedSteps(true,true,false);
-                            }else{
-                                checkNestedSteps(false,false,false);
-                            }
-                        }
-                    } else if (data.previousStep.name === 'Org Configuration') {
-                        $('.providerSelect').removeClass('hidden');
-                        $('#startConfig a, #orgConfiguration a,#configManagement a').addClass('green-btn').removeClass('process-btn');
-                        $('#configManagement a').trigger('click');
-                        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){
-                                checkNestedSteps(true,false);
-                            } else{
-                                checkNestedSteps(false,false);
-                            }
-                        }
-                    } else if (data.previousStep.name === 'Config Management') {
-                        $('#configManagement a').removeClass('active-btn process-btn').addClass('green-btn');
-                        $('#startConfig a,#orgConfiguration a').addClass('green-btn');
-                        $('#providerConfiguration a').trigger('click');
-                        if(data.currentStep.nestedSteps){
-                            var nestedSteps = data.currentStep.nestedSteps;
-                            if(nestedSteps[0].name === 'Provider' && nestedSteps[0].isCompleted === true &&
-                                    nestedSteps[1].name === 'VMImage' && nestedSteps[1].isCompleted === false){
-                                checkNestedSteps(true,false);
-                            } else{
-                                checkNestedSteps(false,false);
-                            }
-                        }
-                    } else if (data.previousStep.name === 'Provider Configuration') {
-                        $('#startConfig a, #orgConfiguration a,#configManagement a,#providerConfiguration a').removeClass('active-btn process-btn').addClass('green-btn');
-                        $('#galleryConfiguration a').trigger('click');
-                        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){
-                                checkNestedSteps(true,false,false);
-                            }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 ){
-                                checkNestedSteps(true,true,false);
-                            }else{
-                                checkNestedSteps(false,false,false);
-                            }
-                        }
-                    } else if (data.previousStep.name === 'Gallery Setup') {
-                        $('#startConfig a, #orgConfiguration a,#configManagement a,#providerConfiguration a,#galleryConfiguration a').removeClass('active-btn process-btn').addClass('green-btn');
-                        $('#devopsConfiguration a').trigger('click');
-                        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){
-                                checkNestedSteps(true,false,false);
-                            }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 ){
-                                checkNestedSteps(true,true,false);
-                            }else{
-                                checkNestedSteps(false,false,false);
-                            }
-                        }
-                    }else if (data.previousStep.name === 'Devops Roles') {
-                        $('#startConfig a, #orgConfiguration a,#configManagement a, #providerConfiguration a,#devopsConfiguration a').removeClass('active-btn process-btn').addClass('green-btn');
-                        $('#trackConfiguration a').trigger('click');
-                    }
+    $('#cancelWizard').click(function(e) {
+        $('#cancelWizard').addClass('hidden');
+        $('.providerSelect').removeClass('hidden');
+        $('#createNew').removeClass('hidden');
+        $('#orgConfiguration a').trigger('click');
+    });
+});
+var selectedDropdownValue, lastDropdownValue;
+selectedDropdownValue = $('#orgDropdown option:selected').val();
+orgForBg = $('#orgDropdown option:selected').text();
+$('#orgConfiguration a').click(function(e) {
+    selectedDropdownValue = $('#orgDropdown option:selected').val();
+    orgForBg = $('#orgDropdown option:selected').text();
+    if (selectedDropdownValue) {
+        getOrgValues();
+    } else {
+        lastDropdownValue = $('#orgDropdown option:last').val();
+    }
+});
+
+$('#configManagement a').click(function(e) {
+    selectedDropdownValue = $('#orgDropdown option:selected').val();
+    orgForBg = $('#orgDropdown option:selected').text();
+});
+
+$('#providerConfiguration a').click(function(e) {
+
+    selectedDropdownValue = $('#orgDropdown option:selected').val();
+    orgForBg = $('#orgDropdown option:selected').text();
+});
+
+function changeWizardStatus(orgIdForSetup) {
+    $('#wizardActionListLoader').show();
+    $.get('/setting-wizard/org/' + orgIdForSetup, function(data) {
+        if (data.length === 0) {
+            $('a.btn').addClass('wizardActiveBtn');
+            $('#wizardActionListLoader').hide();
+        } else {
+            var isCompleted = data.previousStep.isCompleted;
+            if (isCompleted = 'true') {
+                if (data.previousStep.name === 'Introduction') {
+                    $('#startConfig a').addClass('green-btn').removeClass('process-btn');
+                    $('#orgConfiguration a').addClass('wizardActiveBtn').removeClass('process-btn');
+                    $('#orgConfiguration a').trigger('click');
+                    $('#configManagement a,#providerConfiguration a,#galleryConfiguration a,#devopsConfiguration a,#cmdbConfiguration a').removeAttr('href');
+                } else if (data.previousStep.name === 'Org Configuration') {
+                    $('.providerSelect').removeClass('hidden');
+                    $('#startConfig a, #orgConfiguration a').addClass('green-btn').removeClass('process-btn');
+                    $('#configManagement a').trigger('click');
+                    $('#providerConfiguration a,#galleryConfiguration a,#devopsConfiguration a,#cmdbConfiguration a').removeAttr('href');
+                    toastr.error('Please Configure Teams to Navigate to Workzone');
+                } else if (data.previousStep.name === 'Config Management') {
+                    $('#galleryConfiguration a,#devopsConfiguration a,#cmdbConfiguration a').removeAttr('href');
+                    $('#startConfig a,#orgConfiguration a,#configManagement a').removeClass('wizardActiveBtn process-btn').addClass('green-btn');
+                    $('#providerConfiguration a').trigger('click');
+                } else if (data.previousStep.name === 'Provider Configuration') {
+                    $('#devopsConfiguration a,#cmdbConfiguration a').removeAttr('href');
+                    $('#startConfig a, #orgConfiguration a,#configManagement a,#providerConfiguration a').removeClass('wizardActiveBtn process-btn').addClass('green-btn');
+                    $('#galleryConfiguration a').trigger('click');
+                } else if (data.previousStep.name === 'Gallery Setup') {
+                    $('#startConfig a, #orgConfiguration a,#configManagement a,#providerConfiguration a,#galleryConfiguration a').removeClass('wizardActiveBtn process-btn').addClass('green-btn');
+                    $('#devopsConfiguration a').trigger('click');
+                    $('#cmdbConfiguration a').removeAttr('href');
+                } else if (data.previousStep.name === 'Devops Roles') {
+                    $('#startConfig a, #orgConfiguration a,#configManagement a, #providerConfiguration a,#galleryConfiguration a,#devopsConfiguration a').removeClass('wizardActiveBtn process-btn').addClass('green-btn');
+                    $('#cmdbConfiguration a').trigger('click');
                 }
             }
-            $('#wizardActionListLoader').hide();
-        }).error(function(jqXHR) {
-            $('#wizardActionListLoader').hide();
-        });
-    }
+        }
+        $('#wizardActionListLoader').hide();
+    }).error(function(jqXHR) {
+        $('#wizardActionListLoader').hide();
+    });
+}
 </script>
\ No newline at end of file
diff --git a/client/htmls/private/ajax/Settings/bgWizard.html b/client/htmls/private/ajax/Settings/bgWizard.html
index 1290e5ba7..163580448 100644
--- a/client/htmls/private/ajax/Settings/bgWizard.html
+++ b/client/htmls/private/ajax/Settings/bgWizard.html
@@ -1,134 +1,79 @@
-
 <form action="" id="myForm2">
-    <div class="widget-box">
-        <div class="widget-header">
-            <h4 class="widget-margin" style="color:black;">Create Business Group</h4>
-        </div>
-        <div class="widget-body">
-            <div class="widget-main" style="min-height:200px">
-                <div class="jarviswidget" data-widget-editbutton="false" data-widget-custombutton="false">
-                    <div>
-                        <div class="col-lg-6 col-md-6">
-                            <label for="name">Business Group Name <span class="control-label redSpan">&nbsp;*</span></label>
-                            <input autofocus name="productgroupname" value="" id="productgroupname" class="form-control" type="text"  cdata="catalyst" cat-validation="required,nospecial,max15,nospace">
-                        </div>
-                        <div class="col-lg-6 col-md-6">
-                            <label for="">Organization<span class="control-label redSpan">&nbsp;*</span></label>
-                            <select id="orgname" class="chooseOrganization form-control width-100" cdata="catalyst" cat-validation="required">
-                                <option value="">Select an Organization</option>
-                            </select>
-                        </div>
-                    </div>
-                </div>
+   <div class="widget-box">
+      <div class="widget-header">
+         <h4 class="widget-margin" style="color:black;">Create Business Group</h4>
+      </div>
+      <div class="widget-body">
+         <div class="widget-main" style="min-height:200px">
+            <div class="jarviswidget" data-widget-editbutton="false" data-widget-custombutton="false">
+               <div>
+                  <div class="col-lg-6 col-md-6">
+                     <label for="name">Business Group Name <span class="control-label redSpan">&nbsp;*</span></label>
+                     <input autofocus name="productgroupname" value="" id="productgroupname" class="form-control" type="text"  cdata="catalyst" cat-validation="required,nospecial,max15,nospace">
+                  </div>
+                  <div class="col-lg-6 col-md-6">
+                     <label for="">Organization<span class="control-label redSpan">&nbsp;*</span></label>
+                     <select id="orgname" class="chooseOrganization form-control width-100" cdata="catalyst" cat-validation="required">
+                     </select>
+                  </div>
+               </div>
             </div>
-        </div>
-    </div>
-    <div class="btn-group pull-right">
-        <button  name="next2" id="next2" class="nextBG action-button" value="Next">Next</button>
-    </div>
+         </div>
+      </div>
+      <div class="widget-toolbox clearfix">
+            <div class="btn-group pull-right">
+              <a href="ajax/Settings/bgWizard.html" id="createNewBG" style="margin-right:11px;" class="btn btn-primary">&nbsp;Add Another</a>
+             <button name="next1" id="saveBg" 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="bgWizard nextFormWizard btn btn-primary" value="Next"/>
+          </div>
+       </div>
+   </div>
 </form>
 
 
 
 <script>
-    //jQuery time
-    var current_fs, next_fs, previous_fs; //fieldsets
-    var left, opacity, scale; //fieldset properties which we will animate
-    var animating; //flag to prevent quick multi-click glitches
-
     $('.providerSelect').removeClass('hidden');
-    $.get('/d4dMasters/readmasterjsonnew/1',function(data){
-        $("#orgDropdown").empty();
-        for(var i=0;i<data.length;i++){
-            var $option = $('<option></option>').val(data[i].orgname).attr('rowid',data[i].rowid).html(data[i].orgname);
-            $('#orgDropdown').append($option);
-        }
-        orgIdForSetup = $('#orgDropdown option:last').attr('rowid');
-        orgNameForSetup = $('#orgDropdown option:last').val();
-        $('#orgDropdown option:last').attr('selected','selected')
-        var $optionSelect = $('<option></option').val(orgNameForSetup).attr('rowid',orgIdForSetup).html(orgNameForSetup);
+    if (selectedDropdownValue) {
+        var $optionSelect = $('<option></option').val(orgForBg).attr('rowid', selectedDropdownValue).html(orgForBg);
         $('#orgname').append($optionSelect);
-    });
-
+        $('.nextFormWizard').removeAttr('disabled');
+    } else {
+        $('#cancelWizard').addClass('hidden');
+        $.get('/d4dMasters/readmasterjsonnew/1', function(data) {
+            $("#orgDropdown").empty();
+            for (var i = 0; i < data.length; i++) {
+                var $option = $('<option></option>').val(data[i].rowid).attr('rowid', data[i].orgname).html(data[i].orgname);
+                $('#orgDropdown').append($option);
+            }
+            orgNameForSetup = $('#orgDropdown option:last').attr('rowid');
+            orgIdForSetup = $('#orgDropdown option:last').val();
+            lastDropdownValue = $('#orgDropdown option:last').val();
+            $('#orgDropdown option:last').attr('selected', 'selected')
+            var $optionSelect = $('<option></option').val(orgNameForSetup).attr('rowid', orgIdForSetup).html(orgNameForSetup);
+            $('#orgname').append($optionSelect);
+        });
+    }
 
     $('#myForm2').submit(function() {
-        if($(this).valid){
-            if(!saveform('2'))
+        if ($(this).valid) {
+            if (!saveform('2'))
+              $('.btn-4 a').removeClass('not-activeAnchor');
                 return false;
-        }else{
-            alert('invalid valid form submitted'); // for demo
+        } else {
+            toastr.error('invalid valid form submitted'); // for demo
         }
         return false; // for demo
     });
 
-    $(".nextBG").click(function(){
-        $('.content').load("ajax/Settings/projWizard.html");
-        if(animating) return false;
-        animating = true;
-
-        current_fs = $(this).parent();
-        next_fs = $(this).parent().next();
-
-        //activate next step on progressbar using the index of next_fs
-        $("#progressbar li").eq($("div form").index(next_fs)).addClass("active");
-
-        //show the next fieldset
-        next_fs.show();
-        //hide the current fieldset with style
-        current_fs.animate({opacity: 0}, {
-            step: function(now, mx) {
-                //as the opacity of current_fs reduces to 0 - stored in "now"
-                //1. scale current_fs down to 80%
-                scale = 1 - (1 - now) * 0.2;
-                //2. bring next_fs from the right(50%)
-                left = (now * 50)+"%";
-                //3. increase opacity of next_fs to 1 as it moves in
-                opacity = 1 - now;
-                current_fs.css({'transform': 'scale('+scale+')'});
-                next_fs.css({'left': left, 'opacity': opacity});
-            },
-            duration: 800,
-            complete: function(){
-                current_fs.hide();
-                animating = false;
-            },
-            //this comes from the custom easing plugin
-            easing: 'easeInOutBack'
-        });
+    $('#createNewBG').click(function(e){
+      e.preventDefault();
+      $('.content').load(this.getAttribute('href'));
     });
 
-    $(".previous").click(function(){
-        if(animating) return false;
-        animating = true;
-
-        current_fs = $(this).parent();
-        previous_fs = $(this).parent().prev();
-
-        //de-activate current step on progressbar
-        $("#progressbar li").eq($("form").index(current_fs)).removeClass("active");
-
-        //show the previous fieldset
-        previous_fs.show();
-        //hide the current fieldset with style
-        current_fs.animate({opacity: 0}, {
-            step: function(now, mx) {
-                //as the opacity of current_fs reduces to 0 - stored in "now"
-                //1. scale previous_fs from 80% to 100%
-                scale = 0.8 + (1 - now) * 0.2;
-                //2. take current_fs to the right(50%) - from 0%
-                left = ((1-now) * 50)+"%";
-                //3. increase opacity of previous_fs to 1 as it moves in
-                opacity = 1 - now;
-                current_fs.css({'left': left});
-                previous_fs.css({'transform': 'scale('+scale+')', 'opacity': opacity});
-            },
-            duration: 800,
-            complete: function(){
-                current_fs.hide();
-                animating = false;
-            },
-            //this comes from the custom easing plugin
-            easing: 'easeInOutBack'
-        });
+    $(".nextFormWizard").click(function() {
+        $('.contentSetting').find('ol li#bgCreate').removeClass('active').addClass('green-btn');
+        $('.contentSetting').find('ol li#projectCreate').addClass('active');
+        $('.content').load("ajax/Settings/projWizard.html");
     });
 </script>
\ No newline at end of file
diff --git a/client/htmls/private/ajax/Settings/cmdbWizard.html b/client/htmls/private/ajax/Settings/cmdbWizard.html
new file mode 100644
index 000000000..5965fdd25
--- /dev/null
+++ b/client/htmls/private/ajax/Settings/cmdbWizard.html
@@ -0,0 +1,110 @@
+<div class="wizardFlow"></div>
+<!-- fieldsets -->
+<div class="content">
+   <form id="configForm">
+      <div class="widget-box">
+         <div class="widget-header">
+            <h4 class="widget-margin" style="color:black;">ServiceNow CMDB Setting</h4>
+         </div>
+         <div class="widget-body" >
+            <div class="widget-main" style="min-height:300px">
+               <section id="widget-grid" class="">
+                  <!-- START ROW -->
+                  <div class="row">
+                     <!-- NEW COL START -->
+                     <article class="col-sm-12 col-md-12 col-lg-12">
+                        <!-- Widget ID (each widget will need unique ID)-->
+                        <div class="jarviswidget" id="wid-id-3" data-widget-editbutton="false" data-widget-custombutton="false">
+                           <!-- widget div-->
+                           <div>
+                              <div class="widget-body no-padding">
+                                 <div class="col-lg-6 col-md-6">
+                                    <label for="configname">Configuration Name:<span class="control-label redSpan">&nbsp;*</span></label>
+                                    <div class="input-groups"> 
+                                       <input name="configname" value="" id="configname" class="form-control" type="text"  cdata="catalyst" unique="true" uniqueconditionedby="configname">
+                                    </div>
+                                 </div>
+                                 <div class="col-lg-6 col-md-6">
+                                    <label for="url">ServiceNow URL:<span class="control-label redSpan">&nbsp;*</span></label>
+                                    <div class="input-groups">
+                                       <input name="url" value="" id="url" class="form-control" type="url"  cdata="catalyst
+                                          " >
+                                    </div>
+                                 </div>
+                                 <hr>
+                                 <div class="col-lg-6 col-md-6" style="margin-top:25px">
+                                    <label for="username">UserName:<span class="control-label redSpan">&nbsp;*</span></label>
+                                    <div class="input-groups">
+                                       <input type="text" name="username" value="" id="username" class="form-control" type="text"  name="website"  cdata="catalyst"  autocomplete="off">
+                                    </div>
+                                 </div>
+                                 <hr/>
+                                 <div class="col-lg-6 col-md-6" style="margin-top:25px">
+                                    <label for="password">Password:<span class="control-label redSpan">&nbsp;*</span></label>
+                                    <div class="input-groups">
+                                       <input name="password" value="" id="password" class="form-control" type="password"  name="website"  cdata="catalyst"  autocomplete="off">
+                                    </div>
+                                 </div>
+                                 <div class="col-lg-6 col-md-6" style="margin-top:25px">
+                                    <label for="">Organization:<span class="control-label redSpan">&nbsp;*</span></label>
+                                    <div class="input-groups">
+                                       <select name="orgname" id="orgname" class="width-100 form-control"  style="vertical-align:central">
+                                          <option value="">Select an Organization</option>
+                                       </select>
+                                    </div>
+                                 </div>
+                              </div>
+                           </div>
+                           <!-- end widget div -->
+                        </div>
+                        <!-- end widget -->
+                     </article>
+                     <!-- END COL -->
+                  </div>
+                  <!-- END ROW -->
+               </section>
+               <!-- end widget grid -->
+            </div>
+         </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>
+             <input type="button" name="next1" id="next1" class="nextFormWizard btn btn-primary" value="Next"/>
+          </div>
+       </div>
+      </div>
+   </form>
+</div>
+
+
+<script>
+var wizardSteps = $('<ol id="wizardTab" class="bwizard-steps clearfix clickable" role="tablist"><li aria-selected="true" class="btn-2 cmdbCreate active" id="cmdbCreate" style="z-index: 4;"><span class="label badge-inverse">1</span><a href="ajax/Settings/cmdbWizard.html" class="hidden-phone">Create ServiceNow CMDB Settings </a></li></ol>');
+$('.wizardFlow').append(wizardSteps);
+    $('#configForm').submit(function(e) {
+
+        var url = '/servicenow/saveconfig';
+        var configname = $('#configname').val().trim();
+        var servicenowurl = $('#url').val().trim();
+        var username = $('#username').val().trim();
+        var password = $('#password').val().trim();
+        var org = $('#orgname').val().trim();
+        var orgname_rowid = $('#orgname').find(':selected').attr('orgname_rowid');
+        var body = {};
+
+        body.configname = configname;
+        body.servicenowurl = servicenowurl;
+        body.username = username;
+        body.password = password;
+        body.org = org;
+        body.orgname_rowid = orgname_rowid;
+
+        $.post(url, body, function(data) {
+            toastr.success('Setup Has been completed');
+        });
+        return false;
+
+    }); //end of save config action
+    $(".nextFormWizard").click(function() {
+        toastr.success('Successfully completed the Setup & Configuration Wizard');
+    });
+</script>
\ No newline at end of file
diff --git a/client/htmls/private/ajax/Settings/configManagementWizard.html b/client/htmls/private/ajax/Settings/configManagementWizard.html
index 71f23582e..747dfc3b7 100644
--- a/client/htmls/private/ajax/Settings/configManagementWizard.html
+++ b/client/htmls/private/ajax/Settings/configManagementWizard.html
@@ -1,297 +1,242 @@
-<style>
-    /*custom font*/
-    @import url(http://fonts.googleapis.com/css?family=Montserrat);
-
-    /*form styles*/
-    form {
-        margin: 10px auto;
-        position: relative;
-    }
-
-    /*Hide all except first fieldset*/
-    form:not(:first-of-type) {
-        display: none;
-    }
-
-    /*buttons*/
-    form .action-button {
-        width: 100px;
-        background: #27AE60;
-        font-weight: bold;
-        color: white;
-        border: 0 none;
-        border-radius: 1px;
-        cursor: pointer;
-        padding: 10px 5px;
-        margin: 10px 5px;
-    }
-    form .action-button:hover, #msform .action-button:focus {
-        box-shadow: 0 0 0 2px white, 0 0 0 3px #27AE60;
-    }
-    /*headings*/
-    .fs-title {
-        font-size: 15px;
-        text-transform: uppercase;
-        color: #2C3E50;
-        margin-bottom: 10px;
-    }
-    .fs-subtitle {
-        font-weight: normal;
-        font-size: 13px;
-        color: #666;
-        margin-bottom: 20px;
-    }
-    /*progressbar*/
-    #progressbar {
-        overflow: hidden;
-        text-align: center;
-        /*CSS counters to number the steps*/
-        counter-reset: step;
-        margin-top: 5px;
-    }
-    #progressbar li {
-        list-style-type: none;
-        font-size: 15px;
-        width: 50%;
-        float: left;
-        position: relative;
-    }
-    #progressbar li:before {
-        content: counter(step);
-        counter-increment: step;
-        width: 20px;
-        line-height: 20px;
-        display: block;
-        font-size: 10px;
-        color: #fff;
-        background: #7d7676;
-        border-radius: 3px;
-        margin: 0 auto 5px auto;
-    }
-    /*progressbar connectors*/
-    #progressbar li:after {
-        content: '';
-        width: 100%;
-        height: 2px;
-        background: #7d7676;
-        position: absolute;
-        left: -50%;
-        top: 9px;
-        z-index: -1; /*put it behind the numbers*/
-    }
-    #progressbar li:first-child:after {
-        /*connector not needed before the first step*/
-        content: none;
-    }
-    /*marking active/completed steps green*/
-    /*The number of the step and the connector before it = green*/
-    #progressbar li.active:before,  #progressbar li.active:after{
-        background: #27AE60;
-        color: white;
-    }
-
-    .content {
-        margin:0 auto;
-        padding: 10px;
-    }
-    a, a:hover {
-        color:#7d7676;
-        text-decoration: none;
-    }
-</style>
-<!-- multistep form -->
-
-<!-- progressbar -->
-<ul id="progressbar">
-    <li class="chefCreate" id="chefCreate">Chef Server</a></li>
-    <li class="envCreate" id="envCreate">Environments</a></li>
-</ul>
+<div class="wizardFlow"></div>
 <!-- fieldsets -->
 <div class="content">
-    <form action="" id="myForm22">
-        <div class="widget-box">
-            <div class="widget-header">
-                <h4 class="widget-margin" style="color:black;">New Configuration Management</h4>
-            </div>
-            <div class="widget-body">
-                <div class="widget-main" style="height:500px">
-                    <div class="jarviswidget" data-widget-editbutton="false" data-widget-custombutton="false">
-                        <div>
-                            <!-- widget content -->
-                            <div class="col-lg-6 col-md-6">
-                                <label for="">Name:<span class="control-label redSpan">&nbsp;*</span></label>
-                                <input name="ctl00$MainContent$orgname" value="" id="configname" class="form-control" type="text"  cdata="catalyst" unique="true"  cat-validation="required,max15" uniqueconditionedby="configname">
-                            </div>
-                            <div class="col-lg-6 col-md-6">
-                                <label for="name">User Name:<span class="control-label redSpan">&nbsp;*</span></label>
-                                <input name="ctl00$MainContent$orgname" value="" id="loginname" class="form-control" type="text"  cdata="catalyst"  cat-validation="required">
-                            </div>
-                            <hr>
-                            <div class="col-lg-6 col-md-6 margintop20">
-                                <label for="link">URL:<span class="control-label redSpan">&nbsp;*</span></label>
-                                <input type="text" unique="true" uniqueconditionedbyUrl="url" name="ctl00$MainContent$orgname" value="" id="url" class="form-control" type="url"  name="website"  cdata="catalyst"  cat-validation="required,urlcheck">
-                            </div>
-                            <div class="col-lg-6 col-md-6 margintop20">
-                                <label for="name">Organization:<span class="control-label redSpan">&nbsp;*</span></label>
-                                <select id="orgname" unique="true" uniqueconditionedby="orgname"  class="chooseOrganization width-100 form-control" sourcepath="1" datapath="masterjson.rows.row" valuelinkfield="costcode" style="vertical-align:central"  cdata="catalyst"  cat-validation="required">
-                                    <option value="">Select an Organization</option>
-                                </select>
-                            </div>
-                            <hr/>
-                            <input type="hidden" name="ctl00$MainContent$orgname" value="chef" id="configType" class="form-control"  cdata="catalyst"/>
-                            <div class="col-lg-6 col-md-6 margintop20" id="frmconfigmanagement">
-                                <div class="smart-forms">
-                                    <label>User Pem File:<span class="control-label redSpan">&nbsp;*</span></label>
-                                    <label for="userpemfile" class="field file">
-                                        <div class="imgdiv" value="1"></div>
-                                        <span class="button btn-primary">Browse</span><input id="userpemfile" keyfield="configname" type="file" onchange="this.nextSibling.value = this.value"  cdata="catalyst" class="gui-file" cat-validation="required"><input type="text" readonly="" class="gui-input">
-                                    </label>
-                                </div>
-                            </div>
-                            <div class="col-lg-6 col-md-6 margintop20">
-                                <div class="smart-forms">
-                                    <label>Knife.rb File:<span class="control-label redSpan">&nbsp;*</span></label>
-                                    <label for="kniferbfile" class="field file">
-                                        <div class="imgdiv" value="1"></div>
-                                        <span class="button btn-primary">Browse</span><input id="kniferbfile" keyfield="configname" type="file" onchange="this.nextSibling.value = this.value" class="gui-file"  cdata="catalyst" cat-validation="required"><input type="text" readonly="" class="gui-input">
-                                        <input id="folderpath"  cdata="catalyst" type="text" value="" style="display:none"/>
-                                    </label>
-                                </div>
-                            </div>
-                            <div class="col-lg-6 col-md-6 margintop20">
-                                <div class="smart-forms">
-                                    <label>Validator Pem File:</label>
-                                    <label for="validatorpemfile" class="field file">
-                                        <div class="imgdiv" value="1"></div>
-                                        <span class="button btn-primary">Browse</span><input id="validatorpemfile" keyfield="configname" type="file" onchange="this.nextSibling.value = this.value"  cdata="catalyst" class="gui-file"><input type="text" readonly="" class="gui-input">
-                                    </label>
-                                </div>
-                            </div>
-                            <div class="col-lg-6 col-md-6 margintop20">
-                                <div class="smart-forms">
-                                    <label>Key File:</label>
-                                    <label for="validatorpemfile" class="field file">
-                                        <div class="imgdiv" value="1"></div>
-                                        <span class="button btn-primary">Browse</span><input id="encryption" keyfield="configname" type="file" onchange="this.nextSibling.value = this.value"  cdata="catalyst" class="gui-file"><input type="text" readonly="" class="gui-input">
-                                    </label>
-                                </div>
-                            </div>
-                            <div class="col-lg-6 col-md-6 margintop20">
-                                <div class="smart-forms">
-                                    <label>Template File:</label>
-                                    <label for="validatorpemfile" class="field file">
-                                        <div class="imgdiv" value="1"></div>
-                                        <span class="button btn-primary">Browse</span><input id="template" keyfield="configname" type="file" onchange="this.nextSibling.value = this.value"  cdata="catalyst" class="gui-file"><input type="text" readonly="" class="gui-input">
-                                    </label>
-                                </div>
-                            </div>
+   <form action="" id="myForm22">
+      <div class="widget-box">
+         <div class="widget-header">
+            <h4 class="widget-margin" style="color:black;">New Configuration Management</h4>
+         </div>
+         <div class="widget-body">
+            <div class="widget-main" style="height:500px">
+               <div class="jarviswidget" data-widget-editbutton="false" data-widget-custombutton="false">
+                  <div>
+                     <!-- widget content -->
+                     <div class="col-lg-6 col-md-6">
+                        <label for="">Name:<span class="control-label redSpan">&nbsp;*</span></label>
+                        <input name="ctl00$MainContent$orgname" value="" id="configname" class="form-control" type="text"  cdata="catalyst" unique="true"  cat-validation="required,max15" uniqueconditionedby="configname">
+                     </div>
+                     <div class="col-lg-6 col-md-6">
+                        <label for="name">User Name:<span class="control-label redSpan">&nbsp;*</span></label>
+                        <input name="ctl00$MainContent$orgname" value="" id="loginname" class="form-control" type="text"  cdata="catalyst"  cat-validation="required">
+                     </div>
+                     <hr>
+                     <div class="col-lg-6 col-md-6 margintop20">
+                        <label for="link">URL:<span class="control-label redSpan">&nbsp;*</span></label>
+                        <input type="text" unique="true" uniqueconditionedbyUrl="url" name="ctl00$MainContent$orgname" value="" id="url" class="chefUrl form-control" type="url"  name="website"  cdata="catalyst"  cat-validation="required,urlcheck">
+                     </div>
+                     <div class="col-lg-6 col-md-6 margintop20">
+                        <label for="name">Organization:<span class="control-label redSpan">&nbsp;*</span></label>
+                        <select id="orgname" unique="true" uniqueconditionedby="orgname"  class="chooseOrganization width-100 form-control" sourcepath="1" datapath="masterjson.rows.row" valuelinkfield="costcode" style="vertical-align:central"  cdata="catalyst"  cat-validation="required">
+                        </select>
+                     </div>
+                     <hr/>
+                     <input type="hidden" name="ctl00$MainContent$orgname" value="chef" id="configType" class="form-control"  cdata="catalyst"/>
+                     <div class="col-lg-6 col-md-6 margintop20" id="frmconfigmanagement">
+                        <div class="smart-forms">
+                           <label>User Pem File:<span class="control-label redSpan">&nbsp;*</span></label>
+                           <label for="userpemfile" class="field file">
+                              <div class="imgdiv" value="1"></div>
+                              <span class="button btn-primary">Browse</span><input id="userpemfile" keyfield="configname" type="file" onchange="this.nextSibling.value = this.value"  cdata="catalyst" class="gui-file" cat-validation="required"><input type="text" readonly="" class="pemFile gui-input">
+                           </label>
                         </div>
-                    </div>
-                    <div class="btn-group pull-right">
-                        <button  name="nextChef" id="nextChef" class="nextChef action-button" value="Next">Next</button>
-                    </div>
-                </div>
+                     </div>
+                     <div class="col-lg-6 col-md-6 margintop20">
+                        <div class="smart-forms" id="knifeFile">
+                           <label>Knife.rb File:<span class="control-label redSpan">&nbsp;*</span></label>
+                           <label for="kniferbfile" class="field file">
+                              <div class="imgdiv" value="1"></div>
+                              <span class="button btn-primary">Browse</span><input id="kniferbfile" keyfield="configname" type="file" onchange="this.nextSibling.value = this.value" class="gui-file"  cdata="catalyst" cat-validation="required"><input type="text" readonly="" class="knifeFile gui-input">
+                              <input id="folderpath"  cdata="catalyst" type="text" value="" style="display:none"/>
+                           </label>
+                        </div>
+                     </div>
+                     <div class="col-lg-6 col-md-6 margintop20">
+                        <div class="smart-forms">
+                           <label>Validator Pem File:</label>
+                           <label for="validatorpemfile" class="field file">
+                              <div class="imgdiv" value="1"></div>
+                              <span class="button btn-primary">Browse</span><input id="validatorpemfile" keyfield="configname" type="file" onchange="this.nextSibling.value = this.value"  cdata="catalyst" class="gui-file"><input type="text" readonly="" class="gui-input">
+                           </label>
+                        </div>
+                     </div>
+                     <div class="col-lg-6 col-md-6 margintop20">
+                        <div class="smart-forms">
+                           <label>Key File:</label>
+                           <label for="validatorpemfile" class="field file">
+                              <div class="imgdiv" value="1"></div>
+                              <span class="button btn-primary">Browse</span><input id="encryption" keyfield="configname" type="file" onchange="this.nextSibling.value = this.value"  cdata="catalyst" class="gui-file"><input type="text" readonly="" class="gui-input">
+                           </label>
+                        </div>
+                     </div>
+                     <div class="col-lg-6 col-md-6 margintop20">
+                        <div class="smart-forms">
+                           <label>Template File:</label>
+                           <label for="validatorpemfile" class="field file">
+                              <div class="imgdiv" value="1"></div>
+                              <span class="button btn-primary">Browse</span><input id="template" keyfield="configname" type="file" onchange="this.nextSibling.value = this.value"  cdata="catalyst" class="gui-file"><input type="text" readonly="" class="gui-input">
+                           </label>
+                        </div>
+                     </div>
+                  </div>
+               </div>
             </div>
-        </div>
-
-    </form>
+         </div>
+         <div class="widget-toolbox clearfix">
+            <div class="btn-group pull-right">
+               <button name="next1" id="saveBg" 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
-    function checkNestedSteps(chefStatus,envStatus){
-        if(chefStatus === true && envStatus === false){
-            $('li.chefCreate').removeClass('active');
-            $('li.envCreate').addClass('active');
-        }else{
-            $('li.chefCreate').addClass('active');
+ //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);
+         $(this).next().next().val($(this).val());
+     });
+ }
+ $(document).ready(function(e) {
+     //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>');
+     $('.wizardFlow').append(wizardStepsConfig);
+
+     function getConfigValues() {
+         $.get('/d4dMasters/readmasterjsonnew/10', function(data) {
+             for (var i = 0; i < data.length; i++) {
+                 if (selectedDropdownValue === data[i].orgname_rowid[0]) {
+                     $('#myForm22').find('input#configname').val(data[i].configname).attr('disabled', 'disabled');
+                     $('#myForm22').find('input#loginname').val(data[i].loginname).attr('disabled', 'disabled');
+                     $('#myForm22').find('input.chefUrl').val(data[i].url).attr('disabled', 'disabled');
+                     var $optionOrgName = $('<option></option>').val(data[i].orgname[0]).attr('rowid', data[i].orgname_rowid[0]).html(data[i].orgname[0]);
+                     $('#myForm22').find('select#orgname').append($optionOrgName).attr('disabled', 'disabled');
+                     bindChange_importPemFile();
+                     var $pemFileLocation = $('#frmconfigmanagement');
+                     $pemFileLocation.find('input.pemFile').val(data[i].userpemfile_filename);
+                     var $knifeFileLocation = $('#knifeFile');
+                     $knifeFileLocation.find('input.knifeFile').val(data[i].kniferbfile_filename);
+                     $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
+                 }
+             }
+         });
+     }
+
+     function getEnvValues() {
+         $.get('/d4dMasters/readmasterjsonnew/3', 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]);
+                    var $optionConfigNameEnv = $('<option></option>').val(data[i].configname).attr('rowid', data[i].configname_rowid).html(data[i].configname);
+                    $('#myForm1').find('select#orgname').append($optionOrgNameEnv).attr('disabled', 'disabled');
+                     $('#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');
+                     $('.btn-3 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
+                 }
+             }
+         });
+     }
+
+     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-3 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
+                 }
+             }
+         });
+     }
+
+     $('.btn-2 a').click(function(e) {
+         e.preventDefault();
+         clicked = false;
+         $('.contentSetting').load(this.getAttribute('href'));
+     });
+     var clickEnv = false;
+     $('.envCreate a').click(function(e) {
+        e.preventDefault();
+        if(!clickEnv){
+            clickEnv = true;
+             getEnvValues();
+             $('.btn-2 a').parent('.bwizard-steps li').removeClass('active');
+             $(this).parent('.bwizard-steps li').addClass('active');
+             $('.content').load(this.getAttribute('href'));
         }
-    }
-    var current_fs, next_fs, previous_fs; //fieldsets
-    var left, opacity, scale; //fieldset properties which we will animate
-    var animating; //flag to prevent quick multi-click glitches
-    orgNameForSetup = $('#orgDropdown option:last').attr('rowid');
-    orgIdForSetup = $('#orgDropdown option:last').val();
-    var $option = $('<option></option>').val(orgNameForSetup).attr('rowid',orgIdForSetup).html(orgNameForSetup);
-    $('#orgname').append($option);
-
-    function setfolderpath(){
-        var folderpath = '/' + $('#loginname').val() + "/.chef/";
-        $('#folderpath').val(folderpath);
-    }
-
-    $('#myForm22').submit(function() {
-        if(validateForm()) {setfolderpath(); saveform('10');};
-        return false;
-    });
-
-    $(".nextChef").click(function(){
-        $('.content').load('ajax/Settings/envWizard.html');
-        if(animating) return false;
-        animating = true;
-
-        current_fs = $(this).parent();
-        next_fs = $(this).parent().next();
-
-        //activate next step on progressbar using the index of next_fs
-        $("#progressbar li").eq($("div form").index(next_fs)).addClass("active");
-        //show the next fieldset
-        next_fs.show();
-        //hide the current fieldset with style
-        current_fs.animate({opacity: 0}, {
-            step: function(now, mx) {
-                //as the opacity of current_fs reduces to 0 - stored in "now"
-                //1. scale current_fs down to 80%
-                scale = 1 - (1 - now) * 0.2;
-                //2. bring next_fs from the right(50%)
-                left = (now * 50)+"%";
-                //3. increase opacity of next_fs to 1 as it moves in
-                opacity = 1 - now;
-                current_fs.css({'transform': 'scale('+scale+')'});
-                next_fs.css({'left': left, 'opacity': opacity});
-            },
-            duration: 800,
-            complete: function(){
-                current_fs.hide();
-                animating = false;
-            },
-            //this comes from the custom easing plugin
-            easing: 'easeInOutBack'
-        });
-    });
-
-    $(".previous").click(function(){
-        if(animating) return false;
-        animating = true;
-
-        current_fs = $(this).parent();
-        previous_fs = $(this).parent().prev();
-
-        //de-activate current step on progressbar
-        $("#progressbar li").eq($("form").index(current_fs)).removeClass("active");
-
-        //show the previous fieldset
-        previous_fs.show();
-        //hide the current fieldset with style
-        current_fs.animate({opacity: 0}, {
-            step: function(now, mx) {
-                //as the opacity of current_fs reduces to 0 - stored in "now"
-                //1. scale previous_fs from 80% to 100%
-                scale = 0.8 + (1 - now) * 0.2;
-                //2. take current_fs to the right(50%) - from 0%
-                left = ((1-now) * 50)+"%";
-                //3. increase opacity of previous_fs to 1 as it moves in
-                opacity = 1 - now;
-                current_fs.css({'left': left});
-                previous_fs.css({'transform': 'scale('+scale+')', 'opacity': opacity});
-            },
-            duration: 800,
-            complete: function(){
-                current_fs.hide();
-                animating = false;
-            },
-            //this comes from the custom easing plugin
-            easing: 'easeInOutBack'
-        });
-    });
+     });
+     var clickTeam = false;
+     $('.btn-4 a').click(function(e) {
+         e.preventDefault();
+         if(!clickTeam){
+            clickTeam = true
+            getTeamValues();
+             $('.btn-2 a').parent('.bwizard-steps li').removeClass('active');
+             $(this).parent('.bwizard-steps li').addClass('active');
+             $('.content').load(this.getAttribute('href'));
+         }
+     });
+     if (clicked) {
+         $.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');
+                         $('.content').load('ajax/Settings/teamWizard.html');
+                     } else {
+
+                     }
+                 }
+             } else {
+                 getConfigValues();
+                 $('.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');
+             }
+         });
+     } else {
+        //comes when the chefServer is created and navigates back to it.
+        $('.btn-3 a').removeClass('not-activeAnchor');
+        $('.btn-4 a').removeClass('not-activeAnchor');
+         getConfigValues();
+         getEnvValues();
+     }
+
+     $('#wizardActionListLoader').hide();
+ });
+
+ function setfolderpath() {
+     var folderpath = '/' + $('#loginname').val() + "/.chef/";
+     $('#folderpath').val(folderpath);
+ }
+ $('#myForm22').submit(function() {
+     if (validateForm()) {
+         setfolderpath();
+         saveform('10');
+         $('.btn-3 a').removeClass('not-activeAnchor');
+     };
+     return false;
+ });
+
+ $(".nextFormWizard").click(function() {
+     $('.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');
+ });
 </script>
\ No newline at end of file
diff --git a/client/htmls/private/ajax/Settings/devopsRolesWizard.html b/client/htmls/private/ajax/Settings/devopsRolesWizard.html
index ef75583df..b72fbeda9 100644
--- a/client/htmls/private/ajax/Settings/devopsRolesWizard.html
+++ b/client/htmls/private/ajax/Settings/devopsRolesWizard.html
@@ -1,114 +1,4 @@
-<style>
-    /*custom font*/
-    @import url(http://fonts.googleapis.com/css?family=Montserrat);
-
-    /*form styles*/
-    form {
-        margin: 10px auto;
-        position: relative;
-    }
-
-    /*Hide all except first fieldset*/
-    form:not(:first-of-type) {
-        display: none;
-    }
-
-    /*buttons*/
-    form .action-button {
-        width: 100px;
-        background: #27AE60;
-        font-weight: bold;
-        color: white;
-        border: 0 none;
-        border-radius: 1px;
-        cursor: pointer;
-        padding: 10px 5px;
-        margin: 10px 5px;
-    }
-    form .action-button:hover, #msform .action-button:focus {
-        box-shadow: 0 0 0 2px white, 0 0 0 3px #27AE60;
-    }
-    /*headings*/
-    .fs-title {
-        font-size: 15px;
-        text-transform: uppercase;
-        color: #2C3E50;
-        margin-bottom: 10px;
-    }
-    .fs-subtitle {
-        font-weight: normal;
-        font-size: 13px;
-        color: #666;
-        margin-bottom: 20px;
-    }
-    /*progressbar*/
-    #progressbar {
-        overflow: hidden;
-        text-align: center;
-        /*CSS counters to number the steps*/
-        counter-reset: step;
-        margin-top: 5px;
-    }
-    #progressbar li {
-        list-style-type: none;
-        font-size: 15px;
-        width: 25%;
-        float: left;
-        position: relative;
-    }
-    #progressbar li:before {
-        content: counter(step);
-        counter-increment: step;
-        width: 20px;
-        line-height: 20px;
-        display: block;
-        font-size: 10px;
-        color: #fff;
-        background: #7d7676;
-        border-radius: 3px;
-        margin: 0 auto 5px auto;
-    }
-    /*progressbar connectors*/
-    #progressbar li:after {
-        content: '';
-        width: 100%;
-        height: 2px;
-        background: #7d7676;
-        position: absolute;
-        left: -50%;
-        top: 9px;
-        z-index: -1; /*put it behind the numbers*/
-    }
-    #progressbar li:first-child:after {
-        /*connector not needed before the first step*/
-        content: none;
-    }
-    /*marking active/completed steps green*/
-    /*The number of the step and the connector before it = green*/
-    #progressbar li.active:before,  #progressbar li.active:after{
-        background: #27AE60;
-        color: white;
-    }
-
-    .content {
-        margin:0 auto;
-        padding: 10px;
-    }
-    a, a:hover {
-        color:#7d7676;
-        text-decoration: none;
-    }
-</style>
-<!-- multistep form -->
-
-<!-- progressbar -->
-<ul id="progressbar">
-   <li class="nexusCreate">Nexus Server</a></li>
-   <li class="dockerCreate">Docker</a></li>
-   <li class="jenkinsCreate">Jenkins</a></li>
-   <li class="tempCreate">Templates</a></li>
-</ul>
-<!-- fieldsets -->
+<div class="wizardFlow"></div>
 <div class="content">
    <form action="" id="myForm101">
       <div class="widget-box">
@@ -119,259 +9,431 @@ <h4 class="widget-margin" style="color:black;">Nexus Configuration Management</h
             <div class="widget-main" style="min-height:200px">
                <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="">Nexus Server Name:<span class="control-label redSpan">&nbsp;*</span></label>
-                                       <div class="input-groups">
-                                          <input name="" value="" id="nexusservername" class="required form-control" type="text"  cdata="catalyst" unique="true"  cat-validation="required,max15">
-                                       </div>
-                                    </div>
-                                    <div class="col-lg-6 col-md-6">
-                                       <label for="">User Name:<span class="control-label redSpan">&nbsp;*</span></label>
-                                       <div class="input-groups">
-                                          <input autocomplete="false" name="username" id="username" class="form-control" cdata="catalyst" type="text">
-                                       </div>
-                                    </div>
-                                    <div class="col-lg-6 col-md-6 appNameLabel">
-                                       <label for="name">Password:<span class="control-label redSpan">&nbsp;*</span></label>
-                                       <div class="input-groups">
-                                          <input name="nexuspassword" id="nexuspassword" class="form-control" type="text" cdata="catalyst"  cat-validation="required,max15">
-                                       </div>
-                                    </div>
-                                    <div class="col-lg-6 col-md-6 appNameLabel">
-                                       <label for="link">Nexus Server URL:<span class="control-label redSpan">&nbsp;*</span></label>
-                                       <div class="input-groups">
-                                          <input type="text" unique="true" name="hostname" id="hostname" class="form-control" type="text"  cdata="catalyst"  cat-validation="required" type="url">
-                                       </div>
-                                    </div>
-                                    <div class="col-lg-6 col-md-6 appNameLabel">
-                                       <label for="name">Organization:<span class="control-label redSpan">&nbsp;*</span></label>
-                                          <select id="orgname" name="orgname" unique="true" class="form-control chooseOrganization width-100" sourcepath="1" datapath="masterjson.rows.row" valuelinkfield="costcode" style="vertical-align:central"  cdata="catalyst">
-                                             <option value="">Select an Organization</option>
-                                          </select>
-                                    </div>
-                                    <div class="col-lg-6 col-md-6">
-                                       <a style="cursor:pointer;" data-toggle="modal" data-backdrop="  false" id="nexusGroupAnchorDetails" href="#nexusGroupDetailsModal"> <img title="Add Nexus Group Details" data-placement="top" rel="tooltip" style="float:right;margin-top:20px;" src="img/add.png"></a>
-                                       <label style="float:left;margin-top:20px;">Nexus Group ID Details :</label>
-                                       <div class="table-responsive table-div">
-                                          <table id="tablenexusGroupDetails" class="table table-striped table-bordered table-hover dataTable" style="border:1px solid #eeeeee !important; text-align:center;font-size:12px;margin-top:45px;" width="100%" cellpadding="5px">
-                                             <thead>
-                                                <tr class="rowCustomStyle" style="font-weight:bold;">
-                                                   <td style="color:#fff;background-color: #2c3742;">Name</td>
-                                                   <td style="color:#fff;background-color: #2c3742; width:40%">Action</td>
-                                                </tr>
-                                             </thead>
-                                             <tbody id="nexusGroupTbody">
-                                             </tbody>
-                                          </table>
-                                       </div>
-                                    </div>
-                                    <div class="col-lg-6 col-md-6" style="margin-top:25px; display:none">
-                                       <label for="name">Nexus Group ID Details:</label>
-                                       <input autofocus name="ctl00$MainContent$orgname" value="" id="groupid" class="form-control" type="text"  cdata="catalyst">
-                                    </div>
-                                 </div>
-                              </div>
+                     <!-- widget content -->
+                     <div class="widget-body no-padding">
+                        <div class="col-lg-6 col-md-6">
+                           <label for="">Nexus Server Name:<span class="control-label redSpan">&nbsp;*</span></label>
+                           <div class="input-groups">
+                              <input name="" value="" id="nexusservername" class="required form-control" type="text"  cdata="catalyst" unique="true"  cat-validation="required,max15">
+                           </div>
+                        </div>
+                        <div class="col-lg-6 col-md-6">
+                           <label for="">User Name:<span class="control-label redSpan">&nbsp;*</span></label>
+                           <div class="input-groups">
+                              <input autocomplete="false" name="username" id="username" class="form-control" cdata="catalyst" type="text">
+                           </div>
+                        </div>
+                        <div class="col-lg-6 col-md-6 appNameLabel">
+                           <label for="name">Password:<span class="control-label redSpan">&nbsp;*</span></label>
+                           <div class="input-groups">
+                              <input name="nexuspassword" id="nexuspassword" class="form-control" type="text" cdata="catalyst"  cat-validation="required,max15">
+                           </div>
+                        </div>
+                        <div class="col-lg-6 col-md-6 appNameLabel">
+                           <label for="link">Nexus Server URL:<span class="control-label redSpan">&nbsp;*</span></label>
+                           <div class="input-groups">
+                              <input type="text" unique="true" name="hostname" id="hostname" class="form-control" type="text"  cdata="catalyst"  cat-validation="required" type="url">
+                           </div>
+                        </div>
+                        <div class="col-lg-6 col-md-6 appNameLabel">
+                           <label for="name">Organization:<span class="control-label redSpan">&nbsp;*</span></label>
+                           <select id="orgname" name="orgname" unique="true" class="form-control chooseOrganization width-100" sourcepath="1" datapath="masterjson.rows.row" valuelinkfield="costcode" style="vertical-align:central"  cdata="catalyst">
+                           </select>
+                        </div>
+                        <div class="col-lg-6 col-md-6">
+                           <a style="cursor:pointer;" data-toggle="modal" data-backdrop="  false" id="nexusGroupAnchorDetails" href="#nexusGroupDetailsModal"> <img title="Add Nexus Group Details" data-placement="top" rel="tooltip" style="float:right;margin-top:20px;" src="img/add.png"></a>
+                           <label style="float:left;margin-top:20px;">Nexus Group ID Details :</label>
+                           <div class="table-responsive table-div">
+                              <table id="tablenexusGroupDetails" class="table table-striped table-bordered table-hover dataTable" style="border:1px solid #eeeeee !important; text-align:center;font-size:12px;margin-top:45px;" width="100%" cellpadding="5px">
+                                 <thead>
+                                    <tr class="rowCustomStyle" style="font-weight:bold;">
+                                       <td style="color:#fff;background-color: #2c3742;">Name</td>
+                                       <td style="color:#fff;background-color: #2c3742; width:40%">Action</td>
+                                    </tr>
+                                 </thead>
+                                 <tbody id="nexusGroupTbody">
+                                 </tbody>
+                              </table>
+                           </div>
+                        </div>
+                        <div class="col-lg-6 col-md-6" style="margin-top:25px; display:none">
+                           <label for="name">Nexus Group ID Details:</label>
+                           <input autofocus name="ctl00$MainContent$orgname" value="" id="groupid" class="form-control" type="text"  cdata="catalyst">
+                        </div>
+                        <div class="col-lg-6 col-md-6 smart-form margintop20">
+                           <label for="category">Assign Projects:</label>
+                           <div id="projectname" multiselect="multiselect" datatype="select"  class="input-group from-control col-md-12" style="height:150px;overflow-y:auto;padding:2px;border:1px solid silver;width:100%" cdata="catalyst">
+                           </div>
+                        </div>
+                        <div class="col-lg-6 col-md-6">
+                           <a style="cursor:pointer;" data-toggle="modal" data-backdrop="false" id="repoanchorDetails" href="#repodetailsModal"> <img title="Add Repository Details" data-placement="top" rel="tooltip" class="addrepoDetails" style="float:right;margin-top:20px;" src="img/add.png"></a>
+                           <label style="float:left;margin-top:20px;">Repositories Details :</label>
+                           <div class="table-responsive table-div">
+                              <table id="tablerepositoryDetails" class="table table-striped table-bordered table-hover dataTable" style="border:1px solid #eeeeee !important; text-align:center;font-size:12px;margin-top:45px;" width="100%" cellpadding="5px">
+                                 <thead>
+                                    <tr class="rowCustomStyle" style="font-weight:bold;">
+                                       <td style="color:#fff;background-color: #2c3742;">Name</td>
+                                       <td style="color:#fff;background-color: #2c3742; width:10%">Action</td>
+                                    </tr>
+                                 </thead>
+                                 <tbody id="repoDeployTbody">
+                                 </tbody>
+                              </table>
+                           </div>
+                        </div>
+                        <div class="col-lg-6 col-md-6" style="margin-top:25px; display:none">
+                           <label for="name">Repository Details:</label>
+                           <input autofocus name="ctl00$MainContent$orgname" value="" id="repositories" class="form-control" type="text"  cdata="catalyst">
+                        </div>
+                     </div>
+                  </div>
                </div>
             </div>
          </div>
-      </div>
-      <div class="btn-group pull-right">
-         <button  name="nextChef" id="savecreateNexusServerBtn" class="nextChef action-button" value="Next">Next</button>
+         <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>
+               <input type="button" name="next1" id="next1" class="nextFormWizard btn btn-primary" value="Next"/>
+            </div>
+         </div>
       </div>
    </form>
 </div>
+<!--modal for Repo Deploy Details-->
+<div class="modal fade" id="nexusGroupDetailsModal" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="static">
+   <div class="modal-dialog">
+      <div class="modal-content">
+         <form class="" id="nexusGroupDetailsCreate" autocomplete="off">
+            <div class="modal-header">
+               <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
+               &times;
+               </button>
+               <h4 class="modal-title">
+                  <img style="width:18px;margin-left:6px;" src="img/tasksmall.png">&nbsp;&nbsp;Add Nexus Group Details
+               </h4>
+            </div>
+            <div class="modal-body" style="height:150px;">
+               <div class="col-lg-6 col-md-6">
+                  <label for="name">Nexus Group ID:<span class="control-label redSpan">&nbsp;*</span></label>
+                  <input type="text" cdata="catalyst" class="form-control" id="nexusGroupId" value="" name="ctl00$MainContent$orgname">
+               </div>
+            </div>
+            <div class="modal-footer">
+               <a type="button" class="btn btn-default" data-dismiss="modal">
+               <i class="ace-icon fa fa-times bigger-110" style="margin-right: 5px;"></i>Cancel
+               </a>
+               <button class="btn btn-primary btn-mini" id="saveNexusGroupDetails">
+               <i class="ace-icon fa fa-check bigger-110"></i>
+               Save
+               </button>
+            </div>
+         </form>
+      </div>
+   </div>
+</div>
+<!--modal for Repo Deploy Details-->
+<div class="modal fade" id="repodetailsModal" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="static">
+   <div class="modal-dialog">
+      <div class="modal-content">
+         <form class="" id="repoDetailsCreate" autocomplete="off">
+            <div class="modal-header">
+               <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
+               &times;
+               </button>
+               <h4 class="modal-title">
+                  <img style="width:18px;margin-left:6px;" src="img/tasksmall.png">&nbsp;&nbsp;Add Repository Details
+               </h4>
+            </div>
+            <div class="modal-body" style="height:150px;">
+               <div class="col-lg-6 col-md-6">
+                  <label for="">Repository Name:<span style="color:red">*</span>
+                  <span>
+                  <img class="reposerverspinner" src="img/select2-spinner.gif" style="display:none">
+                  </img>
+                  </span>
+                  </label>
+                  <select id="repoNameCreate" name="" class="form-control">
+                     <option value="">Choose Repository</option>
+                  </select>
+               </div>
+            </div>
+            <div class="modal-footer">
+               <a type="button" class="btn btn-default" data-dismiss="modal">
+               <i class="ace-icon fa fa-times bigger-110" style="margin-right: 5px;"></i>Cancel
+               </a>
+               <button class="btn btn-primary btn-mini" id="saveRepoDetails">
+               <i class="ace-icon fa fa-check bigger-110"></i>
+               Save
+               </button>
+            </div>
+         </form>
+      </div>
+   </div>
+</div>
 <script>
-    function checkNestedSteps(nexusStatus,dockerStatus,jenkinsStatus){
-        if(nexusStatus === true && dockerStatus === false && jenkinsStatus === false){
-            $('li.nexusCreate').removeClass('active');
-            $('li.dockerCreate').addClass('active');
-        }else if(nexusStatus === true && dockerStatus === true && jenkinsStatus === false){
-            $('li.nexusCreate,li.dockerCreate').removeClass('active');
-            $('li.jenkinsCreate').addClass('active');
-        }else{
-            $('li.nexusCreate').addClass('active');
+    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);
+    $('#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>';
+                        };
+                    str = str + getTemplate(data[i].projectname, data[i].rowid);
+                    $('#projectname').append(str);
+                }
+            }
+        });
+    });
+    $('#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) {
+        $('.btn-2 a,.btn-4 a').parent('.bwizard-steps li').removeClass('active');
+        $(this).parent('.bwizard-steps li').addClass('active');
+        e.preventDefault();
+        $('.content').load(this.getAttribute('href'));
+    });
+    $('.btn-4 a').click(function(e) {
+        $('.btn-2 a,.btn-3 a').parent('.bwizard-steps li').removeClass('active');
+        $(this).parent('.bwizard-steps li').addClass('active');
+        e.preventDefault();
+        $('.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",
+            "iDisplayLength": 5,
+            "aLengthMenu": [
+                [5, 40, 100, -1],
+                [5, 40, 100, "All"]
+            ],
+            "aoColumns": [{
+                "bSortable": true
+            }, {
+                "bSortable": true
+            }]
+        });
     }
-   $('#nexusGroupAnchorDetails').click(function(e) {
-     $("#nexusGroupDetailsModal").modal('show');
-     $('#nexusGroupDetailsCreate').trigger("reset");
-   });
-   $("#saveNexusGroupDetails").click(function(e) {
-     e.preventDefault();
-     var nexusGroupName = $("#nexusGroupId").val();
-     if (nexusGroupName == '') {
-       alert("Please enter Nexus GroupId");
-     }
-     if (nexusGroupName != '') {
-       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);
+    $("#tablerepositoryDetails_length").hide();
+    $("#tablerepositoryDetails_filter").hide();
+
 
-       $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>');
+    $('#repoanchorDetails').click(function(e) {
+        getNexusRepoDetails();
+    });
+    
+    function getNexusRepoDetails() {
+        var nexusUserName, nexusPassword, nexusHostName;
+        var $form = $('#myForm101');
+        nexusUserName = $form.find('#username').val();
+        nexusPassword = $form.find('#nexuspassword').val();
+        nexusHostName = $form.find('#hostname').val();
+        $('#repoNameCreate').empty();
+        $('#repoNameCreate').append('<option value = "" > Choose Repository </option>');
+        $.get('/nexus/userName/' + nexusUserName + '/nexusPassword/' + nexusPassword + '/repositories?hostName=' + nexusHostName, function(nexusRepos) {
+            $('.reposerverspinner').css('display', 'none');
+            if (nexusRepos.length) {
+                for (var i = 0; i < nexusRepos.length; i++) {
+                    $('#repoNameCreate').append('<option data-repoName="' + nexusRepos[i].name + '" value="' + nexusRepos[i].id + '">' + nexusRepos[i].name + '</option>');
+                }
+            }
+        });
+    }
 
-       $tdAction.find('.deleteRow').click(function() {
-         $nexusGroupDetails.row($tr).remove().draw(true);
-       });
+    $("#saveRepoDetails").click(function(e) {
 
-       $tr.append($tdnexusGroupName).append($tdAction);
-       $nexusGroupTbody.append($tr);
-       $nexusGroupDetails.row.add($tr).draw();
-       $("#nexusGroupDetailsModal").modal('hide');
-     }
-   });
-   $("#savecreateNexusServerBtn").click(function(e) {
-     var nexusGroupList = [];
-     var tableData = $nexusGroupDetails.data();
-     for (var i = 0; i < tableData.length; i++) {
-       nexusGroupList.push(tableData[i][0]);
-     }
-     $('#groupid').val(JSON.stringify(nexusGroupList));
-   });
-   if (!$.fn.dataTable.isDataTable('#tablenexusGroupDetails')) {
-     $nexusGroupDetails = $('#tablenexusGroupDetails').DataTable({
-       "pagingType": "full_numbers",
-       "iDisplayLength": 5,
-       "aLengthMenu": [
-         [5, 40, 100, -1],
-         [5, 40, 100, "All"]
-       ],
-       "aoColumns": [{
-         "bSortable": true
-       }, {
-         "bSortable": true
-       }]
-     });
-   }
-   $("#tablenexusGroupDetails_length").hide();
-   $("#tablenexusGroupDetails_filter").hide();
-   $("#nexusservername").focus();
-   //form validation for dashboard save
-  var orgIdForSetup = $('#orgDropdown').find('option:selected').val();
-  var orgNameForSetup = $('#orgDropdown').find('option:selected').attr('rowid');
-  var $option = $('<option></option>').val(orgNameForSetup).attr('rowid',orgIdForSetup).html(orgNameForSetup);
-    $('#orgname').append($option); 
+        e.preventDefault();
+        var repoServerName = $("#chooseRepoServer").val();
+        var repoName = $("#repoNameCreate").val();
+        if (repoName == '') {
+            alert("Please enter Repository Name");
+        }
+        if (repoName != '') {
+            var $repoDeployTbody = $('#repoDeployTbody');
+            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>');
 
-$('#myForm101').submit(function(e) {
-  
-  var nexusDesc = [];
-  var nexusData = {};
-  
-    var $form = $('#myForm101');
-    nexusData.username = $form.find('#username').val();
-    nexusData.nexuspassword = $form.find('#nexuspassword').val();
-    nexusData.hostname = $form.find('#hostname').val();
-    var reqBody = {
-      nexusDesc: [nexusData]
-    }
-    var url = '../nexus/authenticate'
-    var reqBody = {
-      "username": nexusData.username,
-      "nexuspassword": nexusData.nexuspassword,
-      "hostname": nexusData.hostname
-    };
+            $tdAction.find('.deleteRow').click(function() {
+                $repoDetails.row($tr).remove().draw(true);
+            });
 
-    $.ajax({
-      method: "POST",
-      url: url,
-      data: reqBody,
-      success: function(data, success) {
-        if (!data.length) {
-          bootbox.alert('Invalid Nexus Server Details.');
-        } else {
-          if (validateForm()) {
-            saveform('26');
-          };
-          $('.content').load('ajax/Settings/dockerWizard.html');
-          return false; // for demo
+            $tr.append($tdName).append($tdAction);
+            $repoDeployTbody.append($tr);
+            $repoDetails.row.add($tr).draw();
+            $("#repodetailsModal").hide();
         }
-      },
-      error: function(jqxhr) {
-        bootbox.alert(jqxhr.responseText);
-      },
-      failure: function(jqxhr) {
-        bootbox.alert(jqxhr.responseText);
-      }
+        $("#repoNameCreate").empty();
+        $('#repoNameCreate').append('<option value = "" > Choose Repository </option>');
     });
-  
-  return false;
-});
-    //jQuery time
-    var current_fs, next_fs, previous_fs; //fieldsets
-    var left, opacity, scale; //fieldset properties which we will animate
-    var animating; //flag to prevent quick multi-click glitches
-    $(".nextChef").click(function(){
-        
-        if(animating) return false;
-        animating = true;
 
-        current_fs = $(this).parent();
-        next_fs = $(this).parent().next();
+    $('#nexusGroupAnchorDetails').click(function(e) {
+        $("#nexusGroupDetailsModal").modal('show');
+        $('#nexusGroupDetailsCreate').trigger("reset");
+    });
+    $("#saveNexusGroupDetails").click(function(e) {
+        e.preventDefault();
+        var nexusGroupName = $("#nexusGroupId").val();
+        if (nexusGroupName == '') {
+            alert("Please enter Nexus GroupId");
+        }
+        if (nexusGroupName != '') {
+            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);
 
-        //activate next step on progressbar using the index of next_fs
-        $("#progressbar li").eq($("div form").index(next_fs)).addClass("active");
-        //show the next fieldset
-        next_fs.show();
-        //hide the current fieldset with style
-        current_fs.animate({opacity: 0}, {
-            step: function(now, mx) {
-                //as the opacity of current_fs reduces to 0 - stored in "now"
-                //1. scale current_fs down to 80%
-                scale = 1 - (1 - now) * 0.2;
-                //2. bring next_fs from the right(50%)
-                left = (now * 50)+"%";
-                //3. increase opacity of next_fs to 1 as it moves in
-                opacity = 1 - now;
-                current_fs.css({'transform': 'scale('+scale+')'});
-                next_fs.css({'left': left, 'opacity': opacity});
-            },
-            duration: 800,
-            complete: function(){
-                current_fs.hide();
-                animating = false;
-            },
-            //this comes from the custom easing plugin
-            easing: 'easeInOutBack'
+            $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();
+            $("#nexusGroupDetailsModal").modal('hide');
+        }
+    });
+    $("#saveNexusGroupDetails").click(function(e) {
+        var nexusGroupList = [];
+        var tableData = $nexusGroupDetails.data();
+        for (var i = 0; i < tableData.length; i++) {
+            nexusGroupList.push(tableData[i][0]);
+        }
+        $('#groupid').val(JSON.stringify(nexusGroupList));
+    });
+    if (!$.fn.dataTable.isDataTable('#tablenexusGroupDetails')) {
+        $nexusGroupDetails = $('#tablenexusGroupDetails').DataTable({
+            "pagingType": "full_numbers",
+            "iDisplayLength": 5,
+            "aLengthMenu": [
+                [5, 40, 100, -1],
+                [5, 40, 100, "All"]
+            ],
+            "aoColumns": [{
+                "bSortable": true
+            }, {
+                "bSortable": true
+            }]
         });
+    }
+    $("#tablenexusGroupDetails_length").hide();
+    $("#tablenexusGroupDetails_filter").hide();
+    $("#nexusservername").focus();
+    //form validation for dashboard save
+
+    $("#saveProviderWizard").click(function(e) {
+        var repositories = {
+            nexus: []
+        };
+        var nexusList = [];
+        var tableData = $repoDetails.data();
+        for (var i = 0; i < tableData.length; i++) {
+            nexusList.push(tableData[i][0]);
+        }
+        repositories.nexus = nexusList;
+        $('#repositories').val(JSON.stringify(repositories));
     });
 
-    $(".previous").click(function(){
-        if(animating) return false;
-        animating = true;
 
-        current_fs = $(this).parent();
-        previous_fs = $(this).parent().prev();
+    $('#myForm101').submit(function(e) {
 
-        //de-activate current step on progressbar
-        $("#progressbar li").eq($("form").index(current_fs)).removeClass("active");
+        var nexusDesc = [];
+        var nexusData = {};
 
-        //show the previous fieldset
-        previous_fs.show();
-        //hide the current fieldset with style
-        current_fs.animate({opacity: 0}, {
-            step: function(now, mx) {
-                //as the opacity of current_fs reduces to 0 - stored in "now"
-                //1. scale previous_fs from 80% to 100%
-                scale = 0.8 + (1 - now) * 0.2;
-                //2. take current_fs to the right(50%) - from 0%
-                left = ((1-now) * 50)+"%";
-                //3. increase opacity of previous_fs to 1 as it moves in
-                opacity = 1 - now;
-                current_fs.css({'left': left});
-                previous_fs.css({'transform': 'scale('+scale+')', 'opacity': opacity});
+        var $form = $('#myForm101');
+        nexusData.username = $form.find('#username').val();
+        nexusData.nexuspassword = $form.find('#nexuspassword').val();
+        nexusData.hostname = $form.find('#hostname').val();
+        var reqBody = {
+            nexusDesc: [nexusData]
+        }
+        var url = '../nexus/authenticate'
+        var reqBody = {
+            "username": nexusData.username,
+            "nexuspassword": nexusData.nexuspassword,
+            "hostname": nexusData.hostname
+        };
+
+        $.ajax({
+            method: "POST",
+            url: url,
+            data: reqBody,
+            success: function(data, success) {
+                if (!data.length) {
+                    bootbox.alert('Invalid Nexus Server Details.');
+                } else {
+                    if (validateForm()) {
+                        saveform('26');
+                    };
+                    return false; // for demo
+                }
             },
-            duration: 800,
-            complete: function(){
-                current_fs.hide();
-                animating = false;
+            error: function(jqxhr) {
+                $('.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');
+                return false;
+                bootbox.alert(jqxhr.responseText);
             },
-            //this comes from the custom easing plugin
-            easing: 'easeInOutBack'
+            failure: function(jqxhr) {
+                bootbox.alert(jqxhr.responseText);
+            }
         });
+
+        return false;
+    });
+    $(".nextFormWizard").click(function() {
+        $('.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');
     });
 </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 a27b3d964..e7e646dee 100644
--- a/client/htmls/private/ajax/Settings/dockerWizard.html
+++ b/client/htmls/private/ajax/Settings/dockerWizard.html
@@ -38,17 +38,84 @@ <h4 class="widget-margin" style="color:black;">Create Docker</h4>
                                           <label for="">Password: <span class="control-label redSpan">&nbsp;*</span></label>
                                           <input name="ctl00$MainContent$orgname" value="" id="dockerpassword" class="form-control" type="text"  cdata="catalyst" cat-validation="required" value="*********">
                                        </div>
+                                       <div class="col-lg-6 col-md-6 smart-form margintop20">
+                                    <label for="category">Assign Projects:</label>
+                                    <div id="projectname" multiselect="multiselect" datatype="select"  class="input-group from-control col-md-12" style="height:150px;overflow-y:auto;padding:2px;border:1px solid silver;width:100%" cdata="catalyst">
+                                    </div>
+                                </div>
+                                 <div class="col-lg-6 col-md-6">
+                                          <a style="cursor:pointer;" data-toggle="modal" data-backdrop="false" id="repoanchorDetails" href="#repodetailsModal"> <img title="Add Repository Details" data-placement="top" rel="tooltip" class="addrepoDetails" style="float:right;margin-top:20px;" src="img/add.png"></a>
+                                          <label style="float:left;margin-top:20px;">Repositories Details :</label>
+                                          <div class="table-responsive table-div">
+                                            <table id="tablerepositoryDetails" class="table table-striped table-bordered table-hover dataTable" style="border:1px solid #eeeeee !important; text-align:center;font-size:12px;margin-top:45px;" width="100%" cellpadding="5px">
+                                                <thead>
+                                                    <tr class="rowCustomStyle" style="font-weight:bold;">
+                                                        <td style="color:#fff;background-color: #2c3742;">Name</td>
+                                                        <td style="color:#fff;background-color: #2c3742; width:10%">Action</td>
+                                                    </tr>
+                                                </thead>
+                                                <tbody id="repoDeployTbody">
+                                                </tbody>
+                                            </table>
+                                          </div>
+                                        </div>
+                                        <div class="col-lg-6 col-md-6" style="margin-top:25px; display:none">
+                                          <label for="name">Repository Details:</label>
+                                          <input autofocus name="ctl00$MainContent$orgname" value="" id="repositories" class="form-control" type="text"  cdata="catalyst">
+                                       </div>
                                     </div>
                                     <!-- end widget content -->
                                  </div>
             </div>
          </div>
       </div>
-   </div>
-   <div class="btn-group pull-right">
-      <button  name="nextChef" id="nextChef" class="nextChef action-button" value="Next">Next</button>
+      <div class="widget-toolbox clearfix">
+            <div class="btn-group pull-right">
+             <button name="next1" id="saveDockerWizard" 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>
    </div>
 </form>
+<!--row ends here-->
+<div class="modal fade" id="repodetailsModal" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="static">
+   <div class="modal-dialog">
+      <div class="modal-content">
+         <form class="" id="repoDetailsCreate" autocomplete="off">
+            <div class="modal-header">
+               <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
+               &times;
+               </button>
+               <h4 class="modal-title">
+                  <img style="width:18px;margin-left:6px;" src="img/tasksmall.png">&nbsp;&nbsp;Add Repository Details
+               </h4>
+            </div>
+            <div class="modal-body" style="height:150px;">
+               <div class="col-lg-6 col-md-6">
+                    <label for="">Repository Name:<span style="color:red">*</span>
+                    <span>
+                        <img class="reposerverspinner" src="img/select2-spinner.gif" style="display:none">
+                        </img>
+                    </span>
+                </label>
+                    <select id="repoNameCreate" name="" class="form-control">
+                        <option value="">Choose Repository</option>
+                    </select>
+                </div>
+            </div>
+            <div class="modal-footer">
+              <a type="button" class="btn btn-default" data-dismiss="modal">
+                <i class="ace-icon fa fa-times bigger-110" style="margin-right: 5px;"></i>Cancel
+              </a>
+              <button class="btn btn-primary btn-mini" id="saveRepoDetails">
+                <i class="ace-icon fa fa-check bigger-110"></i>
+                Save
+              </button>
+            </div>
+         </form>
+      </div>
+   </div>
+</div>
 <script>
     //jQuery time
     var current_fs, next_fs, previous_fs; //fieldsets
@@ -57,9 +124,81 @@ <h4 class="widget-margin" style="color:black;">Create Docker</h4>
 
     var $option = $('<option></option>').val(orgNameForSetup).attr('rowid',orgIdForSetup).html(orgNameForSetup);
     $('#orgname').append($option);
+
+    $('#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>';
+                       };
+                   str = str + getTemplate(data[i].projectname, data[i].rowid);
+                   $('#projectname').append(str);
+               }
+           }
+       });
+    });
+    $('#orgname').trigger('change');
    
      $("#dockerreponame").focus();
 
+     if (!$.fn.dataTable.isDataTable('#tablerepositoryDetails')) {
+      $repoDetails = $('#tablerepositoryDetails').DataTable({
+           "pagingType": "full_numbers",
+           "iDisplayLength": 5,
+           "aLengthMenu": [
+               [5, 40, 100, -1],
+               [5, 40, 100, "All"]
+           ],
+           "aoColumns": [
+               {
+                   "bSortable": true
+               }, {
+                   "bSortable": true
+               }
+           ]
+       });
+   }
+   $("#tablerepositoryDetails_length").hide();
+   $("#tablerepositoryDetails_filter").hide();
+
+  $('#repoanchorDetails').click(function(e){
+      getDockerRepositories();
+  });
+  
+  function getDockerRepositories(){
+    $('.reposerverspinner').css('display', 'inline-block');
+    $('#repoNameCreate').select2('destroy').empty();
+    $('#repoNameCreate').append('<option value = "" > Choose Repository </option>');
+      $.get('/d4dMasters/readmasterjsonnew/17',function(templates){
+        if(templates.length){
+          $('.reposerverspinner').css('display', 'none');
+          for(var i=0; i< templates.length; i++){
+            if(templates[i].dockercontainerpaths){
+              $('#repoNameCreate').append('<option value='+templates[i].dockercontainerpaths+'>'+templates[i].dockercontainerpaths+'</option>');
+            }
+          }
+        } else {
+          $('.reposerverspinner').css('display', 'none');
+        }
+      });
+   }
+
+   $("#saveDockerWizard").click(function(e) {
+        var repositories = {
+          docker: []
+        };
+        var dockerList = [];
+        var tableData = $repoDetails.data();
+        for(var i=0; i< tableData.length;i++){
+            dockerList.push(tableData[i][0]);
+        }
+        repositories.docker = dockerList;
+        $('#repositories').val(JSON.stringify(repositories));
+    });
+
      function validateandsaveform() {
     var button = $("form[id*='myForm']").find("div.pull-right > button");
     if (button) {
@@ -73,7 +212,6 @@ <h4 class="widget-margin" style="color:black;">Create Docker</h4>
         if (validateForm()) {
           saveform('18');
         }
-        $('.content').load('ajax/Settings/jenkinsWizard.html');
         return false;
       } else {
         $("#masterssavespinner").detach();
@@ -94,73 +232,9 @@ <h4 class="widget-margin" style="color:black;">Create Docker</h4>
      });
    
 
-     $(".nextChef").click(function(){
-        
-        if(animating) return false;
-        animating = true;
-
-        current_fs = $(this).parent();
-        next_fs = $(this).parent().next();
-
-        //activate next step on progressbar using the index of next_fs
-        $("#progressbar li").eq($("div form").index(next_fs)).addClass("active");
-        //show the next fieldset
-        next_fs.show();
-        //hide the current fieldset with style
-        current_fs.animate({opacity: 0}, {
-            step: function(now, mx) {
-                //as the opacity of current_fs reduces to 0 - stored in "now"
-                //1. scale current_fs down to 80%
-                scale = 1 - (1 - now) * 0.2;
-                //2. bring next_fs from the right(50%)
-                left = (now * 50)+"%";
-                //3. increase opacity of next_fs to 1 as it moves in
-                opacity = 1 - now;
-                current_fs.css({'transform': 'scale('+scale+')'});
-                next_fs.css({'left': left, 'opacity': opacity});
-            },
-            duration: 800,
-            complete: function(){
-                current_fs.hide();
-                animating = false;
-            },
-            //this comes from the custom easing plugin
-            easing: 'easeInOutBack'
-        });
-    });
-
-    $(".previous").click(function(){
-        if(animating) return false;
-        animating = true;
-
-        current_fs = $(this).parent();
-        previous_fs = $(this).parent().prev();
-
-        //de-activate current step on progressbar
-        $("#progressbar li").eq($("form").index(current_fs)).removeClass("active");
-
-        //show the previous fieldset
-        previous_fs.show();
-        //hide the current fieldset with style
-        current_fs.animate({opacity: 0}, {
-            step: function(now, mx) {
-                //as the opacity of current_fs reduces to 0 - stored in "now"
-                //1. scale previous_fs from 80% to 100%
-                scale = 0.8 + (1 - now) * 0.2;
-                //2. take current_fs to the right(50%) - from 0%
-                left = ((1-now) * 50)+"%";
-                //3. increase opacity of previous_fs to 1 as it moves in
-                opacity = 1 - now;
-                current_fs.css({'left': left});
-                previous_fs.css({'transform': 'scale('+scale+')', 'opacity': opacity});
-            },
-            duration: 800,
-            complete: function(){
-                current_fs.hide();
-                animating = false;
-            },
-            //this comes from the custom easing plugin
-            easing: 'easeInOutBack'
-        });
+     $(".nextFormWizard").click(function(){
+        $('.content').load('ajax/Settings/jenkinsWizard.html');
+        $('.contentSetting').find('ol li#dockerCreate').removeClass('active').addClass('green-btn');
+        $('.contentSetting').find('ol li#jenkinsCreate').addClass('active');
     });
 </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 9ed79e487..9bfa0e299 100644
--- a/client/htmls/private/ajax/Settings/envWizard.html
+++ b/client/htmls/private/ajax/Settings/envWizard.html
@@ -14,14 +14,12 @@ <h4 class="widget-margin" style="color:black;">Create Environment</h4>
                                     <label for="category">Organization:<span class="control-label redSpan">&nbsp;*</span>
                                     </label>
                                     <select id="orgname" class="chooseOrganization width-100 form-control" valuelinkfield="costcode" style="vertical-align:central" cdata="catalyst" cat-validation="required" cat-validation="required" onchange="$('#configname').change();">
-                                        <option value="">Select an Organization</option>
                                     </select>
                                 </div>
                                 <div class="col-lg-6 col-md-6">
                                     <label for="category">Chef Server:
                                     </label>
                                     <select id="configname" class="chooseOrganization width-100 form-control" sourcepath="10" datapath="masterjson.rows.row" style="vertical-align:central" cdata="catalyst">
-                                        <option value="">Select a Chef Server</option>
                                     </select>
                                 </div>
                                 <div class="col-lg-6 col-md-6 margintop20">
@@ -29,8 +27,9 @@ <h4 class="widget-margin" style="color:black;">Create Environment</h4>
                                     </label>
                                     <a href="javascript:void(0)" class="clearfix pull-right" onclick="if(preprocess()) {$('#myModalCreateChefEnv').modal('show')}">Add</a>
                                     <select id="environmentname" class="chooseOrganization width-100 form-control" datapath="masterjson.rows.row" style="vertical-align:central" cdata="catalyst" unique="true">
-                                        <option value="">Select an Chef Environment</option>
+                                        
                                     </select>
+                                    <input id="environmentName" class="hidden chooseOrganization width-100 form-control" datapath="masterjson.rows.row" style="vertical-align:central" cdata="catalyst" unique="true"/>
                                 </div>
                                 <div class="col-lg-6 col-md-6 hidden">
                                     <label for="category">Puppet Server:
@@ -56,13 +55,16 @@ <h4 class="widget-margin" style="color:black;">Create Environment</h4>
                             <!-- end widget content -->
                         </div>
                     </div>
-                    <div class="btn-group pull-right">
-                        <button  name="nextEnv" id="nextEnv" class="nextEnv action-button" value="Next">Next</button>
-                    </div>
                 </div>
             </div>
+            <div class="widget-toolbox clearfix">
+                <div class="btn-group pull-right">
+                  <a href="ajax/Settings/envWizard.html" id="createNewEnv" style="margin-right:11px;" class="btn btn-primary">&nbsp;Add Another</a>
+                 <button name="next1" id="saveConfigEnv" 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>
 <div class="modal fade bs-example-modal-sg" id="myModalCreateChefEnv" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="static">
@@ -97,143 +99,155 @@ <h4 class="modal-title">Add a Chef Environment</h4>
 </div>
 
 <script>
-    var $optionOrg = $('<option></option>').val(orgNameForSetup).attr('rowid',orgIdForSetup).html(orgNameForSetup);
-    $('#orgname').append($optionOrg);
-    $('#orgname').change(function(){
-        $.get('/d4dMasters/readmasterjsonnew/10',function(data){
-            if(orgIdForSetup === data[0].orgname_rowid[0]){
-                var $optionChefServer = $('<option></option>').val(data[0].configname).attr('rowid',data[0].rowid).html(data[0].configname);
-                $('#configname').append($optionChefServer);
-            }
-        });
-    })
+$(document).ready(function(e){
+   var $optionOrg = $('<option></option>').val(orgNameForSetup).attr('rowid', orgIdForSetup).html(orgNameForSetup);
+   $('#orgname').append($optionOrg);
+   $('#orgname').change(function() {
+       $('#projectname').empty();
+       $.get('/d4dMasters/readmasterjsonnew/10', function(data) {
+           for (var i = 0; i < data.length; i++) {
+               if (orgIdForSetup === data[i].orgname_rowid[0]) {
+                   var $optionChefServer = $('<option></option>').val(data[i].configname).attr('rowid', data[i].rowid).html(data[i].configname);
+                   $('#configname').append($optionChefServer).trigger('change');
+               }
+           }
+       });
+       $.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>';
+                       };
+                   str = str + getTemplate(data[i].projectname, data[i].rowid);
+                   $('#projectname').append(str);
+               }
+           }
+       });
 
-    $('#orgname').change(function(){
-        $.get('/d4dMasters/readmasterjsonnew/4',function(data){
-            $('#projectname').empty();
-            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" rowid="1ae4f099-7adc-4089-81c6-db2248774142"' + 'value="' + rowid + '" style="width:100%"><i data-swchoff-text="NO" data-swchon-text="YES"></i>' + val + '</label>';
-                            };
+   });
 
-                    for (var i = 0; i < data.length; i++) {
-                        str = str + getTemplate(data[i].projectname,data[i].rowid);
-                        $('#projectname').append(str);
-                    }
+   $('#orgname').trigger('change');
 
-                }
-            }
-        });
-    });
-    function preprocess() {
-        $('#createenvinchefform')[0].reset();
-        if (typeof $('#configname').find('option:selected').attr('rowid') == 'undefined') {
-            bootbox.alert('Select a Chef Server before adding an environments.');
-            return (false);
-        } else
-            return (true);
-    }
-    $('#createenvinchefform').submit(function(e) {
-        var reqBodyEnv = {};
-        var chefid = $('#configname').find('option:selected').attr('rowid');
-        var $crbtn = $('#createenvinchefform').find('#createchefenvbtn')
-        $crbtn.attr('disabled', 'disabled');
-        var $form = $('#createenvinchefform');
-        reqBodyEnv.name = $form.find('#chefenvname').val();
-        if (!reqBodyEnv.name) {
-            alert('Please Enter Environment Name');
-            return false;
-        }
-        $('#envcreatespinner').removeClass('hidden');
-        if (typeof chefid != 'undefined') {
+   function preprocess() {
+       $('#createenvinchefform')[0].reset();
+       if (typeof $('#configname').find('option:selected').attr('rowid') == 'undefined') {
+           bootbox.alert('Select a Chef Server before adding an environments.');
+           return (false);
+       } else
+           return (true);
+   }
+   $('#createenvinchefform').submit(function(e) {
+       var reqBodyEnv = {};
+       var chefid = $('#configname').find('option:selected').attr('rowid');
+       var $crbtn = $('#createenvinchefform').find('#createchefenvbtn')
+       $crbtn.attr('disabled', 'disabled');
+       var $form = $('#createenvinchefform');
+       reqBodyEnv.name = $form.find('#chefenvname').val();
+       if (!reqBodyEnv.name) {
+           alert('Please Enter Environment Name');
+           return false;
+       }
+       $('#envcreatespinner').removeClass('hidden');
+       if (typeof chefid != 'undefined') {
 
-            $.ajax({
-                type: "Post",
-                url: '../chef/environments/create/' + chefid,
-                data: {
-                    envName: $('#chefenvname').val()
-                },
-                success: function(envname, success) {
-                    if (envname) {
-                        $crbtn.removeAttr('disabled');
-                        $('#envcreatespinner').addClass('hidden');
-                        $('#configname').change();
-                        $('#myModalCreateChefEnv').modal('hide');
-                        $('#environmentname').empty();
-                    } else {
-                        $('#chefenvcreatemsg').html('Could not complete.' + envname);
-                        $crbtn.removeAttr('disabled');
-                        $('#envcreatespinner').addClass('hidden');
-                        $('#myModalCreateChefEnv').modal('hide');
-                    }
-                },
-                error: function(jqxhr) {
-                    bootbox.alert(jqxhr.responseText);
-                    $crbtn.removeAttr('disabled');
-                    $('#envcreatespinner').addClass('hidden');
-                    $('#myModalCreateChefEnv').modal('hide');
-                },
-                failure: function(envname) {
-                    bootbox.alert(envname.responseText);
-                }
-            });
-        }
-        return false;
-    });
-    function loadChefEnvs(chefID) {
-        $('#myForm1').find('button').attr('disabled', 'disabled');
-        $.get('../chef/servers/' + chefID + '/environments', function(envList) { //getting the list of env
+           $.ajax({
+               type: "Post",
+               url: '../chef/environments/create/' + chefid,
+               data: {
+                   envName: $('#chefenvname').val()
+               },
+               success: function(envname, success) {
+                   if (envname) {
+                       $crbtn.removeAttr('disabled');
+                       $('#envcreatespinner').addClass('hidden');
+                       $('#configname').change();
+                       $('#myModalCreateChefEnv').modal('hide');
+                       $('#environmentname').empty();
+                   } else {
+                       $('#chefenvcreatemsg').html('Could not complete.' + envname);
+                       $crbtn.removeAttr('disabled');
+                       $('#envcreatespinner').addClass('hidden');
+                       $('#myModalCreateChefEnv').modal('hide');
+                   }
+               },
+               error: function(jqxhr) {
+                   bootbox.alert(jqxhr.responseText);
+                   $crbtn.removeAttr('disabled');
+                   $('#envcreatespinner').addClass('hidden');
+                   $('#myModalCreateChefEnv').modal('hide');
+               },
+               failure: function(envname) {
+                   bootbox.alert(envname.responseText);
+               }
+           });
+       }
+       return false;
+   });
 
-            if (envList) {
-                var envlist = envList.toString().split(',');
-                var $envselect = $('#environmentname').addClass('envselect').addClass('form-control').addClass('width100').addClass('padding0');
-                for (var j = 0; j < envList.length; j++) {
-                    if ($envselect.val() === envList[j]) {
-                        $envselect.html('');
-                    }
-                    $envselect.append('<option value="' + envList[j] + '">' + envList[j] + '</option>');
-                }
-                $envselect.val($envselect.attr('savedvalue'));
-                $envselect.change();
-                $('#myForm1').find('button').removeAttr('disabled');
-            }
-        });
-    }
-    $('#configname').change(function() {
-        var chefid = $(this).find('option:selected').attr('rowid');
-        if (chefid)
-            loadChefEnvs(chefid);
-    });
-    $('#myForm1').submit(function() {
-        $(this).validate();
+   function loadChefEnvs(chefID) {
+       $('#myForm1').find('button').attr('disabled', 'disabled');
+       $.get('../chef/servers/' + chefID + '/environments', function(envList) { //getting the list of env
 
-        if ($(this).valid) {
-            /* alert('valid form submitted'); // for demo*/
-            var chefEnv = $('#environmentname option:selected').val();
-            var puppetEnv = $('#puppetenvironmentname option:selected').val();
-            if (!chefEnv) {
-                alert('Chef Environment Required.');
-                return false;
-            }
+           if (envList) {
+               var envlist = envList.toString().split(',');
+               var $envselect = $('#environmentname').addClass('envselect').addClass('form-control').addClass('width100').addClass('padding0');
+               for (var j = 0; j < envList.length; j++) {
+                   if ($envselect.val() === envList[j]) {
+                       $envselect.html('');
+                   }
+                   $envselect.append('<option value="' + envList[j] + '">' + envList[j] + '</option>');
+               }
+               $envselect.val($envselect.attr('savedvalue'));
+               $envselect.change();
+               $('#myForm1').find('button').removeAttr('disabled');
+           }
+       });
+   }
+   $('#configname').change(function(e) {
+       var chefid = $(this).find('option:selected').attr('rowid');
+       if (chefid)
+           loadChefEnvs(chefid);
+   });
 
-            if (!puppetEnv) {
-                $('#puppetservername').val('');
-            }
-            if (!chefEnv) {
-                $('#configname').val('');
-            }
-            if (!saveform('3')) {
-                $('#providerConfiguration a').trigger('click');
-                return false;
-            }
-        } else {
-            alert('invalid valid form submitted'); // for demo
-        }
-        return false; // for demo
-    });
-    $(".nextEnv").click(function(){
-        toastr.success('Step 2 - Config Management Setup Completed');
+   $('#myForm1').submit(function() {
+       $(this).validate();
+
+       if ($(this).valid) {
+           var chefEnv = $('#environmentname option:selected').val();
+           var puppetEnv = $('#puppetenvironmentname option:selected').val();
+           if (!chefEnv) {
+               alert('Chef Environment Required.');
+               return false;
+           }
+
+           if (!puppetEnv) {
+               $('#puppetservername').val('');
+           }
+           if (!chefEnv) {
+               $('#configname').val('');
+           }
+           if (!saveform('3')) {
+               $('.btn-4 a').removeClass('not-activeAnchor');
+               return false;
+           }
+       } else {
+           alert('invalid valid form submitted'); // for demo
+       }
+       return false; // for demo
+   });
+
+   $('#createNewEnv').click(function(e){
+      $('.content').empty();
+      e.preventDefault();   
+      $('.content').load(this.getAttribute('href'));
     });
+   $(".nextFormWizard").click(function() {
+    $('.content').empty();
+    clickTeam = false;
+     $('.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');
+   });
+});
 </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
new file mode 100644
index 000000000..1f7487c18
--- /dev/null
+++ b/client/htmls/private/ajax/Settings/galleryWizard.html
@@ -0,0 +1,283 @@
+<div class="wizardFlow">
+</div>
+<!-- fieldsets -->
+<div class="content">
+   <form action="" id="myForm6">
+   <div class="widget-box">
+      <div class="widget-header">
+         <h4 class="widget-margin" style="color:black;">Create Templates</h4>
+      </div>
+      <div class="widget-body">
+         <div class="widget-main" style="min-height:200px">
+            <div class="jarviswidget" data-widget-editbutton="false" data-widget-custombutton="false">
+               <div>
+                  <!-- widget content -->
+                  <div class="widget-body no-padding">
+                     <div class="row zero-margin" >
+                        <div class="col-lg-6 col-md-6">
+                           <label for="">Template Name:<span class="control-label redSpan">&nbsp;*</span></label>
+                           <label id="msgOrgName"></label>
+                           <input name="ctl00$MainContent$orgname" value="" id="templatename" class="form-control"  cdata="catalyst" unique="true" uniqueconditionedby="templatename,templatetypename" type="text" cat-validation="required,max15">
+                        </div>
+                        <div class="col-lg-6 col-md-6">
+                           <div class="smart-forms">
+                              <label for="">Icon:</label>
+                              <label for="templatesicon" name="field" class="file">
+                                 <div class="imgdiv" value="1"></div>
+                                 <span class="button btn-primary">Browse</span><input id="templatesicon" type="file" onchange="this.nextSibling.value = this.value" cdata="catalyst" class="gui-file"><input type="text" readonly="" class="gui-input">
+                              </label>
+                           </div>
+                        </div>
+                     </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>
+                     </div>
+                     <div class="col-lg-6 col-md-6" hidden>
+                        Template Provider Path:
+                        <label id="msgOrgName" style="display:none;color:red;float:right;">Required</label>
+                        <input name="ctl00$MainContent$orgname" value="https://" id="providertemplatepath" class="form-control" type="text">
+                     </div>
+                     <div class="col-lg-6 col-md-6 margintop20">
+                        <label for="category">Organization:<span class="control-label redSpan">&nbsp;*</span>
+                        </label>
+                        <select id="orgname" class="chooseOrganization width-100 form-control" sourcepath="1" datapath="masterjson.rows.row" valuelinkfield="costcode" style="vertical-align:central" cdata="catalyst" cat-validation="required" cat-validation="required" linkedfields="['configname']" onchange="loadCookbookSelectorControlFromOrgId('orgname')">
+                          <option>Select Organization</option>
+                        </select>
+                     </div>
+                     <div  class="col-lg-6 col-md-6 forDocker margintop20">
+                        <label for="">
+                        Select Docker Repo 
+                        </label>
+                        <select id="dockerreponame" class="form-control choosedockerRepo width-100" sourcepath="18" datapath="masterjson.rows.row"  cdata="catalyst">
+                           <option value="">Select an Docker Path</option>
+                        </select>
+                     </div>
+                     <div class="col-lg-6 col-md-6 notforDocker forCFT" style="margin-top:20px;display:none">
+                        <div class="smart-forms">
+                           <label>Template File:<span class="control-label redSpan">&nbsp;*</span></label>
+                           <label for="validatorpemfile" class="field file">
+                              <div class="imgdiv" value="1"></div>
+                              <span class="button btn-primary">Browse</span><input id="template" keyfield="configname" type="file" onchange="this.nextSibling.value = this.value" cdata="catalyst" class="gui-file"><input type="text" readonly="" class="gui-input">
+                           </label>
+                        </div>
+                     </div>
+                     <div class="col-lg-6 col-md-6 forDocker hidden" style="margin-top:16px">
+                        <label for="">
+                        Title
+                        <label id="msgOrgName2" style="display:none;color:red;float:right;">Required</label></label>
+                        <input name="ctl00$MainContent$costcode" value="" id="dockercontainerstitle" class="form-control" type="text" datavalues="dockercontainerstitle" targetelement="dockercontainerpathstitle"  show="imgCheck" maxlength="13">
+                     </div>
+                     <div class="col-lg-6 col-md-6 forDocker" style="margin-top:16px;">
+                        <label for="">
+                        Add  Docker Repo Path <span class="control-label redSpan">&nbsp;*</span>
+                        <label id="msgOrgName2" style="display:none;color:red;float:right;">Required</label>
+                        </label>
+                        <input name="ctl00$MainContent$costcode" value="" id="dockercontainers" class="form-control" type="text" datavalues="dockercontainerpaths" targetelement="dockercontainerpaths"  relatedlist="dockercontainerpathstitle" show="imgDed">
+                        <div class="input-group hidden">
+                           <span class="input-group-addon" style="padding:1px !important;">
+                           <input type="button" class="btn btn-sm btn-primary" title="Check to add to list" style="width:53px;height:34px;" value="Add" onclick="addToTargetList($('#dockercontainers'),$('#dockercontainerstitle'));" />
+                           </span>
+                        </div>
+                     </div>
+                     <div class="col-lg-12 col-md-12 notforDocker notCFT" style="margin-top:25px">
+                        <div class="row notforDocker" style="margin-top:15px">
+                           <div class="" id="templatescookbooks" cdata='catalyst'>
+                           </div>
+                        </div>
+                     </div>
+                     <div class="col-lg-12 col-md-12 forDocker">
+                        <div class="col-lg-6 col-md-6 forDocker  noleftpadding" style="margin-top:15px">
+                           <div id="dockercontainerpathstitle" class="input-group from-control col-md-12 forDocker" style="height:20px;overflow-y:auto;min-width:105px;"  cdata="catalyst" ctype="list" csource="dockercontainerstitle" ></div>
+                        </div>
+                        <div class="col-lg-6 col-md-6 forDocker" style="margin-top:15px">
+                           <div id="dockercontainerpaths" class="input-group from-control col-md-12 forDocker" style="height:20px;overflow-y:auto;"  cdata="catalyst" ctype="list" csource="dockercontainers"></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="saveProviderWizard" 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>
+   </div>
+</form>
+</div>
+<script>
+    $(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);
+        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>');
+        $('.wizardFlow').append(wizardFlowGallery);
+
+        /*function getTemplateValues() {
+          $.get('/d4dMasters/readmasterjsonnew/17',function(data){
+            $('#myForm6').find('select#orgname').empty();
+            $('#myForm6').find('select#dockerreponame').empty();
+            $('#myForm6').find('select#templatetypename').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);
+                  $('#orgname').append($optionOrg).attr('disabled','disabled');
+                  var $optionDockerRepoName = $('<option></option>').val(data[i].dockerreponame).html(data[i].dockerreponame);
+                  $('#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#dockerreponame').append($optionDockerRepoName).attr('disabled','disabled');
+                  $('#myForm6').find('input#dockercontainers').val(data[i].dockercontainerpaths).attr('disabled','disabled');
+                }
+            }
+          });
+        }*/
+        $('.btn-2 a').click(function(e) {
+            e.preventDefault();
+            clicked = false;
+            $('.contentSetting').load(this.getAttribute('href'));
+        });
+        $('.btn-3 a').click(function(e) {
+            $('.btn-2 a').parent('.bwizard-steps li').removeClass('active')
+            $(this).parent('.bwizard-steps li').addClass('active');
+            e.preventDefault();
+            $('.content').load(this.getAttribute('href'));
+        });
+        $('.btn-4 a').click(function(e) {
+            $('.btn-2 a,.btn-3 a').parent('.bwizard-steps li').removeClass('active');
+            $(this).parent('.bwizard-steps li').addClass('active');
+            e.preventDefault();
+            $('.content').load(this.getAttribute('href'));
+        });
+
+        
+        $.get('/d4dMasters/readmasterjsonnew/18', function(data){
+            for(var i =0;i<data.length;i++){
+              if(orgIdForSetup === data[i].orgname_rowid[0]){
+                var $option = $('<option></option>').val(data[i].dockerreponame).attr('rowid',data[i].rowid).html(data[i].dockerreponame);
+                $('#dockerreponame').append($option);
+              }
+            }
+        });
+          
+
+        //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 === '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 {}
+            }
+        });
+        $('#wizardActionListLoader').hide();
+        } else {
+            getTemplateValues();
+            $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
+        }
+    });
+    $.get('/d4dMasters/readmasterjsonnew/16', function(data) {
+        data = JSON.parse(data);
+        for (var i = 0; i < data.length; i++) {
+            if (data[i].templatetypename == 'Composite' || data[i].templatetypename == 'OSImage') {
+                continue;
+            } else {
+                if (orgIdForSetup == data[i].orgname_rowid) {
+                    var $optionTemplates = $('<option></option>').val(data[i].templatetypename).attr('rowid', data[i].rowid).html(data[i].templatetypename);
+                    $('#templatetypename').append($optionTemplates);
+                }
+            }
+        }
+    });
+    $('templatetypename').trigger('click');
+
+    function loadCookbookSelectorControlFromOrgId(orgId) {
+        var csid = $('#' + orgId + ' option:selected').attr('rowid');
+
+        if (csid != undefined) {
+            //alert(csid);
+            var itms = $('#templatescookbooks').attr('savedvalue');
+            if (itms) {
+                itms = itms.split(',');
+            } else {
+                itms = [];
+            }
+            console.log(itms);
+            var $ccrs = $chefCookbookRoleSelector(csid, null, itms);
+            $('#templatescookbooks').empty().append($ccrs).data('$ccrs', $ccrs);
+
+        }
+    }
+
+    $('#myForm6').submit(function() {
+
+        var templateType = $('#templatetypename').val();
+        if (templateType === 'Docker') {
+            if ($('#dockercontainers').val() != '') {
+                $('#dockercontainerpaths').html('');
+                addToTargetList($('#dockercontainers'), $('#templatename'));
+            }
+        }
+        $(this).validate();
+        if (templateType === 'Docker' || templateType === 'SoftwareStack') {
+
+            $('#template').removeAttr('cat-validation', 'required');
+            //Explicitly adding validation for repo path
+            if (templateType === 'Docker' && $('#dockercontainerpaths').text() == "")
+                $('#dockercontainers').attr('cat-validation', 'required');
+            else {
+                $('#dockercontainers').removeAttr('cat-validation');
+
+            }
+
+
+            if ($(this).valid) {
+                /*alert('valid form submitted'); // for demo*/
+                if (validateForm()) {
+
+                    saveform('17');
+                };
+            } else {
+                alert('invalid form submitted'); // for demo
+            }
+        } else if (templateType === 'CloudFormation' || templateType === 'ARMTemplate') {
+
+            $('#template').attr('cat-validation', 'required');
+            //explicity removing validation for repo path
+            $('#dockercontainers').removeAttr('cat-validation');
+            if ($(this).valid) {
+                /*alert('valid form submitted'); // for demo*/
+                if (validateForm()) {
+
+                    saveform('17');
+                };
+            } else {
+                alert('invalid valid form submitted'); // for demo
+            }
+        }
+        return false; // for demo
+    });
+    $(".nextFormWizard").click(function() {
+        $('.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');
+    });
+</script>
\ No newline at end of file
diff --git a/client/htmls/private/ajax/Settings/jenkinsWizard.html b/client/htmls/private/ajax/Settings/jenkinsWizard.html
index fda12b6da..425be5ecd 100644
--- a/client/htmls/private/ajax/Settings/jenkinsWizard.html
+++ b/client/htmls/private/ajax/Settings/jenkinsWizard.html
@@ -38,18 +38,16 @@ <h4 class="widget-margin" style="color:black;">Create Jenkins</h4>
                                  </div>
             </div>
          </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>
+             <input type="button" name="next1" id="next1" class="nextFormWizard btn btn-primary" value="Next"/>
+          </div>
+       </div>
       </div>
    </div>
-   <div class="btn-group pull-right">
-      <button  name="nextChef" id="nextChef" class="nextChef action-button" value="Next">Next</button>
-   </div>
 </form>
 <script>
-    //jQuery time
-    var current_fs, next_fs, previous_fs; //fieldsets
-    var left, opacity, scale; //fieldset properties which we will animate
-    var animating; //flag to prevent quick multi-click glitches
-
     var $option = $('<option></option>').val(orgNameForSetup).attr('rowid',orgIdForSetup).html(orgNameForSetup);
     $('#orgname').append($option);
    
@@ -65,45 +63,10 @@ <h4 class="widget-margin" style="color:black;">Create Jenkins</h4>
    });
    
 
-     $(".nextChef").click(function(){
-      //toastr.success
-      $('.content').load('ajax/Settings/templatesWizard.html');
-        //toastr.success('Step 4 - Devops Roles Configuration Completed');
-        //$('#providerConfiguration a').trigger('click');
-    });
-
-    $(".previous").click(function(){
-        if(animating) return false
-        animating = true;
-
-        current_fs = $(this).parent();
-        previous_fs = $(this).parent().prev();
-
-        //de-activate current step on progressbar
-        $("#progressbar li").eq($("form").index(current_fs)).removeClass("active");
-
-        //show the previous fieldset
-        previous_fs.show();
-        //hide the current fieldset with style
-        current_fs.animate({opacity: 0}, {
-            step: function(now, mx) {
-                //as the opacity of current_fs reduces to 0 - stored in "now"
-                //1. scale previous_fs from 80% to 100%
-                scale = 0.8 + (1 - now) * 0.2;
-                //2. take current_fs to the right(50%) - from 0%
-                left = ((1-now) * 50)+"%";
-                //3. increase opacity of previous_fs to 1 as it moves in
-                opacity = 1 - now;
-                current_fs.css({'left': left});
-                previous_fs.css({'transform': 'scale('+scale+')', 'opacity': opacity});
-            },
-            duration: 800,
-            complete: function(){
-                current_fs.hide();
-                animating = false;
-            },
-            //this comes from the custom easing plugin
-            easing: 'easeInOutBack'
-        });
+     $(".nextFormWizard").click(function(){
+        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();
+        $('#cmdbConfiguration a').trigger('click');
     });
 </script>
\ No newline at end of file
diff --git a/client/htmls/private/ajax/Settings/projWizard.html b/client/htmls/private/ajax/Settings/projWizard.html
index 0425d84f9..9dddc3bfc 100644
--- a/client/htmls/private/ajax/Settings/projWizard.html
+++ b/client/htmls/private/ajax/Settings/projWizard.html
@@ -1,13 +1,12 @@
-<div class="bgContent">
-   <form action="" id="myForm3" class="content">
-      <div class="widget-box">
-         <div class="widget-header">
-            <h4 class="widget-margin" style="color:black;">Create Project</h4>
-         </div>
-         <div class="widget-body">
-            <div class="widget-main" style="min-height:200px">
-               <div class="jarviswidget" id="wid-id-3" data-widget-editbutton="false" data-widget-custombutton="false">
-                <div>
+<form action="" id="myForm3" class="content">
+   <div class="widget-box">
+      <div class="widget-header">
+         <h4 class="widget-margin" style="color:black;">Create Project</h4>
+      </div>
+      <div class="widget-body">
+         <div class="widget-main" style="min-height:200px">
+            <div class="jarviswidget" id="wid-id-3" data-widget-editbutton="false" data-widget-custombutton="false">
+               <div>
                   <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>
@@ -22,13 +21,11 @@ <h4 class="widget-margin" style="color:black;">Create Project</h4>
                      <div class="col-lg-6 col-md-6" style="margin-top:25px;">
                         <label for="">Organization:<span class="control-label redSpan">&nbsp;*</span></label>
                         <select id="orgname" class="chooseOrganization form-control width-100" linkedfields="['productgroupname','environmentname','teamname']"  cdata="catalyst" cat-validation="required">
-                           <option value="">Select Organization</option>
                         </select>
                      </div>
                      <div class="col-lg-6 col-md-6" style="margin-top:25px;">
                         <label for="">Business Group:<span class="control-label redSpan">&nbsp;*</span></label>
                         <select id="productgroupname" class="chooseBG form-control width-100" linkedto="orgname"  cdata="catalyst" cat-validation="required">
-                           <option value="">Select Business Group</option>
                         </select>
                      </div>
                      <div class="col-lg-6 col-md-6 smart-form hidden" style="margin-top:25px;">
@@ -36,121 +33,84 @@ <h4 class="widget-margin" style="color:black;">Create Project</h4>
                         <div  id="environmentname" multiselect="multiselect" datatype="select" sourcepath="3" datapath="masterjson.rows.row"  linkedto="orgname" class="input-group from-control col-md-12 widthBox" cdata="catalyst">
                         </div>
                      </div>
-                     <div class="col-lg-6 col-md-6 hidden">
-                        <a style="cursor:pointer;" data-toggle="modal" data-backdrop="false" id="repoanchorDetails" href="#repodetailsModal"> <img title="Add Repository Details" data-placement="top" rel="tooltip" class="addrepoDetails" style="float:right;margin-top:20px;" src="img/add.png"></a>
-                        <label style="float:left;margin-top:20px;">Repositories Details :</label>
-                        <div class="table-responsive table-div">
-                           <table id="tablerepositoryDetails" class="table table-striped table-bordered table-hover dataTable" style="border:1px solid #eeeeee !important; text-align:center;font-size:12px;margin-top:45px;" width="100%" cellpadding="5px">
-                              <thead>
-                                 <tr class="rowCustomStyle" style="font-weight:bold;">
-                                    <td style="color:#fff;background-color: #2c3742; width:35%">Repository</td>
-                                    <td style="color:#fff;background-color: #2c3742;">Name</td>
-                                    <td style="color:#fff;background-color: #2c3742; width:10%">Action</td>
-                                 </tr>
-                              </thead>
-                              <tbody id="repoDeployTbody">
-                              </tbody>
-                           </table>
-                        </div>
-                     </div>
-                     <div class="col-lg-6 col-md-6 hidden">
-                        <label for="name">Repository Details:</label>
-                        <input autofocus name="ctl00$MainContent$orgname" value="" id="repositories" class="form-control" type="text"  cdata="catalyst">
-                     </div>
                      <!-- end widget content -->
                   </div>
-                </div>
                </div>
             </div>
          </div>
       </div>
-      <div class="btn-group pull-right">
-         <button  name="next2" id="next3" class="nextBG action-button" value="Next">Next</button>
-      </div>
-   </form>
-</div>
+      <div class="widget-toolbox clearfix">
+            <div class="btn-group pull-right">
+            <a href="ajax/Settings/projWizard.html" id="createNewProj" style="margin-right:11px;" class="btn btn-primary">&nbsp;Add Another</a>
+             <button name="next1" id="saveProj" 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>
 
-<script>
-    //jQuery time
-    var current_fs, next_fs, previous_fs; //fieldsets
-    var left, opacity, scale; //fieldset properties which we will animate
-    var animating; //flag to prevent quick multi-click glitches
 
-    var $optionSelect = $('<option></option').val(orgNameForSetup).attr('rowid',orgIdForSetup).html(orgNameForSetup);
-    $('#orgname').append($optionSelect);   
-       
-    $('#orgname').change(function(e){
+<script>
+//to get the businessGroupname corresponding to the organisation.
+function getBusinessGroupName(orgId) {
+    $.get('/d4dMasters/readmasterjsonnew/2', function(data) {
+        for (var i = 0; i < data.length; i++) {
+            if (data[i].orgname_rowid[0] === orgId) {
+                var $option = $('<option></option>').val(data[i].productgroupname).attr('rowid', data[i].rowid).html(data[i].productgroupname);
+                $('#productgroupname').append($option);
+            }
+        }
+    });
+}
+//if orgId already available
+if (selectedDropdownValue) {
+    $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
+    $('.btn-3 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
+    var $optionSelect = $('<option></option').val(orgForBg).attr('rowid', selectedDropdownValue).html(orgForBg);
+    $('#orgname').append($optionSelect);
+    getBusinessGroupName(selectedDropdownValue);
+    $('.nextFormWizard').removeAttr('disabled');
+} else {
+    orgNameForSetup = $('#orgDropdown option:last').attr('rowid');
+    orgIdForSetup = $('#orgDropdown option:last').val();
+    $('#orgDropdown option:last').attr('selected', 'selected')
+    var $optionSelect = $('<option></option').val(orgNameForSetup).attr('rowid', orgIdForSetup).html(orgNameForSetup);
+    $('#orgname').append($optionSelect);
+    $('#orgname').change(function(e) {
         $('#productgroupname').empty();
         var orgValue = $('#orgname option:selected').attr('rowid');
         orgValueSelected = $('#orgname option:selected').attr('rowid');
-        $.get('/d4dMasters/readmasterjsonnew/2',function(data){
-            for(var i=0;i<data.length;i++){
-              if(data[i].orgname_rowid[0] === orgIdForSetup) {
-                  var $option = $('<option></option>').val(data[i].productgroupname).attr('rowid',data[i].rowid).html(data[i].productgroupname);
-                  $('#productgroupname').append($option);    
-              }
-            }
-        });
-    });
-    
-    var repositories = {
-          nexus: [],
-          docker: []
-        };
-    $('#repositories').val(JSON.stringify(repositories));
-    
-    $('#myForm3').submit(function() {
-           $(this).validate();
-   
-           if($(this).valid){
-                /*alert('valid form submitted'); // for demo*/
-               if(!saveform('4')){
-                $('#configManagement a').trigger('click');
-                changeWizardStatus(orgIdForSetup);
-                return false;
-              }
-           }else{
-                alert('invalid valid form submitted'); // for demo
-           }
-           return false; // for demo
-       }); 
-    
-    $(".nextBG").click(function(){
-      toastr.success('Step 1 - Org Setup Completed');
+        getBusinessGroupName(orgIdForSetup);
     });
+}
+$('#orgname').trigger('change');
 
-   /* $(".previous").click(function(){
-        if(animating) return false;
-        animating = true;
-
-        current_fs = $(this).parent();
-        previous_fs = $(this).parent().prev();
+//form submit for project.
+$('#myForm3').submit(function() {
+    $(this).validate();
+    if ($(this).valid) {
+        if (!saveform('4')) {
+            return false;
+        }
+    } else {
+        toastr.error('invalid valid form submitted'); // for demo
+    }
+    return false; // for demo
+});
 
-        //de-activate current step on progressbar
-        $("#progressbar li").eq($("form").index(current_fs)).removeClass("active");
+$('#createNewProj').click(function(e){
+  $('.content').empty();
+  e.preventDefault();   
+  $('.content').load(this.getAttribute('href'));
+});
 
-        //show the previous fieldset
-        previous_fs.show();
-        //hide the current fieldset with style
-        current_fs.animate({opacity: 0}, {
-            step: function(now, mx) {
-                //as the opacity of current_fs reduces to 0 - stored in "now"
-                //1. scale previous_fs from 80% to 100%
-                scale = 0.8 + (1 - now) * 0.2;
-                //2. take current_fs to the right(50%) - from 0%
-                left = ((1-now) * 50)+"%";
-                //3. increase opacity of previous_fs to 1 as it moves in
-                opacity = 1 - now;
-                current_fs.css({'left': left});
-                previous_fs.css({'transform': 'scale('+scale+')', 'opacity': opacity});
-            },
-            duration: 800,
-            complete: function(){
-                current_fs.hide();
-                animating = false;
-            },
-            //this comes from the custom easing plugin
-            easing: 'easeInOutBack'
-        });
-    });*/
+$(".nextFormWizard").click(function() {
+    $('#wizardActionListLoader').show();
+    $('#configManagement a').trigger('click');
+    $('#startConfig a, #orgConfiguration a').addClass('green-btn').removeClass('process-btn');
+    $('.wizardFlow').empty();
+    toastr.success('Step 1 - Org Setup Completed');
+    $('#createNew').removeClass('hidden');
+    $('#cancelWizard').addClass('hidden');
+});
 </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 399019c6b..a9b40f146 100644
--- a/client/htmls/private/ajax/Settings/providerWizard.html
+++ b/client/htmls/private/ajax/Settings/providerWizard.html
@@ -1,110 +1,5 @@
-<style>
-    /*custom font*/
-    @import url(http://fonts.googleapis.com/css?family=Montserrat);
-
-    /*form styles*/
-    form {
-        margin: 10px auto;
-        position: relative;
-    }
-
-    /*Hide all except first fieldset*/
-    form:not(:first-of-type) {
-        display: none;
-    }
-
-    /*buttons*/
-    form .action-button {
-        width: 100px;
-        background: #27AE60;
-        font-weight: bold;
-        color: white;
-        border: 0 none;
-        border-radius: 1px;
-        cursor: pointer;
-        padding: 10px 5px;
-        margin: 10px 5px;
-    }
-    form .action-button:hover, #msform .action-button:focus {
-        box-shadow: 0 0 0 2px white, 0 0 0 3px #27AE60;
-    }
-    /*headings*/
-    .fs-title {
-        font-size: 15px;
-        text-transform: uppercase;
-        color: #2C3E50;
-        margin-bottom: 10px;
-    }
-    .fs-subtitle {
-        font-weight: normal;
-        font-size: 13px;
-        color: #666;
-        margin-bottom: 20px;
-    }
-    /*progressbar*/
-    #progressbar {
-        overflow: hidden;
-        text-align: center;
-        /*CSS counters to number the steps*/
-        counter-reset: step;
-        margin-top: 5px;
-    }
-    #progressbar li {
-        list-style-type: none;
-        font-size: 15px;
-        width: 50%;
-        float: left;
-        position: relative;
-    }
-    #progressbar li:before {
-        content: counter(step);
-        counter-increment: step;
-        width: 20px;
-        line-height: 20px;
-        display: block;
-        font-size: 10px;
-        color: #fff;
-        background: #7d7676;
-        border-radius: 3px;
-        margin: 0 auto 5px auto;
-    }
-    /*progressbar connectors*/
-    #progressbar li:after {
-        content: '';
-        width: 100%;
-        height: 2px;
-        background: #7d7676;
-        position: absolute;
-        left: -50%;
-        top: 9px;
-        z-index: -1; /*put it behind the numbers*/
-    }
-    #progressbar li:first-child:after {
-        /*connector not needed before the first step*/
-        content: none;
-    }
-    /*marking active/completed steps green*/
-    /*The number of the step and the connector before it = green*/
-    #progressbar li.active:before,  #progressbar li.active:after{
-        background: #27AE60;
-        color: white;
-    }
-
-    .content {
-        margin:0 auto;
-        padding: 10px;
-    }
-    a, a:hover {
-        color:#7d7676;
-        text-decoration: none;
-    }
-</style>
-<!-- multistep form -->
-<!-- progressbar -->
-<ul id="progressbar">
-   <li class="providerCreate">Create Providers</a></li>
-   <li class="imageCreate">VmImages</a></li>
-</ul>
+<div class="wizardFlow">
+</div>
 <!-- fieldsets -->
 <div class="content">
    <form id="myForm54" enctype="mutlipart/form-data" action="/aws/providers" method="post">
@@ -112,813 +7,819 @@
          <div class="widget-header">
             <h4 class="widget-margin" style="color:black;">Create Providers</h4>
          </div>
-         <div class="widget-body">
-            <fieldset>
-               <div class="widget-main">
-                  <section id="widget-grid" class="">
-                     <!-- START ROW -->
-                     <div class="row">
-                        <!-- NEW COL START -->
-                        <article class="col-sm-12 col-md-12 col-lg-12">
-                           <!-- Widget ID (each widget will need unique ID)-->
-                           <div class="jarviswidget" id="wid-id-3" data-widget-editbutton="false" data-widget-custombutton="false">
-                              <!-- widget div-->
-                              <div id="appender">
-                                 <!-- widget content -->
-                                 <div class="row">
-                                    <div class="col-lg-6 col-md-6">
-                                       <label for="name">Provider Type:
-                                       <span style="color: Red;" class="control-label">&nbsp;*</span></label>
-                                       <select id="providertype" name="providerType" unique="true" uniqueconditionedby="orgname" class="form-control chooseOrganization width-100" style="vertical-align: central" cat-validation="required" cdata="catalyst" skiprowid="yes" onchange="UtilityMethods.providerChanged($(this).val());">
-                                          <option value="">Select Provider</option>
-                                          <option value="AWS">AWS</option>
-                                          <option value="OPENSTACK">OPENSTACK</option>
-                                          <option value="VMWARE">VMWARE</option>
-                                          <option value="AZURE">AZURE</option>
-                                       </select>
-                                    </div>
-                                    <div class="col-lg-6 col-md-6">
-                                       <label for="">Name:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
-                                       <input name="providerName" placeholder="Enter Name of the Provider" id="name" class="form-control" type="text" cdata="catalyst" cat-validation="required,max15,nospace" cat-validation-openstack="required,max15,nospace" cat-validation-azure="required,max15,nospace" cat-validation-vmware="required,max15,nospace">
-                                    </div>
+         <div class="widget-body" >
+           <fieldset>
+            <div class="widget-main">
+               <section id="widget-grid" class="">
+                  <!-- START ROW -->
+                  <div class="row">
+                     <!-- NEW COL START -->
+                     <article class="col-sm-12 col-md-12 col-lg-12">
+                        <!-- Widget ID (each widget will need unique ID)-->
+                        <div class="jarviswidget" id="wid-id-3" data-widget-editbutton="false" data-widget-custombutton="false">
+                           <!-- widget div-->
+                           <div id="appender">
+                              <!-- widget content -->
+                              <div class="row">
+                                 <div class="col-lg-6 col-md-6">
+                                    <label for="name">Provider Type:
+                                    <span style="color: Red;" class="control-label">&nbsp;*</span></label>
+                                    <select id="providertype" name="providerType" unique="true" uniqueconditionedby="orgname" class="form-control chooseOrganization width-100" style="vertical-align: central" cat-validation="required" cdata="catalyst" skiprowid="yes" onchange="UtilityMethods.providerChanged($(this).val());">
+                                       <option value="">Select Provider</option>
+                                       <option value="AWS">AWS</option>
+                                       <option value="OPENSTACK">OPENSTACK</option>
+                                       <option value="VMWARE">VMWARE</option>
+                                       <option value="AZURE">AZURE</option>
+                                    </select>
                                  </div>
-                                 <div class="row foraws">
-                                    <div class="col-lg-6 col-md-6 margintop20">
-                                       <span>
-                                       <label style="margin-bottom: 0px; vertical-align: middle; margin-top: 5px;">
-                                       Credentials:
-                                       <span style="color: Red;" class="control-label">&nbsp;*</span>
-                                       </label>
-                                       </span>
-                                       <span style="margin-right: 20px; margin-left: 20px;">
-                                       <input type="radio" name="isDefault" value="false"
-                                          style="vertical-align: middle;" id="credentials-accessKeys" checked>
-                                       <label for="credentials-accessKeys" style="margin-bottom:0px; margin-top: 5px; vertical-align: middle;">
-                                       Use access keys
-                                       </label>
-                                       </span>
-                                       <span style="margin-right: 20px;">
-                                       <input type="radio" name="isDefault" value="true"
-                                          style="vertical-align: middle;" id="credentials-IAMRole">
-                                       <label for="credentials-IAMRole" style="margin-bottom:0px; margin-top: 5px; vertical-align: middle;">
-                                       Use IAM role
+                                 <div class="col-lg-6 col-md-6">
+                                    <label for="">Name:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
+                                    <input name="providerName" placeholder="Enter Name of the Provider" id="name" class="form-control" type="text" cdata="catalyst" cat-validation="required,max15,nospace" cat-validation-openstack="required,max15,nospace" cat-validation-azure="required,max15,nospace" cat-validation-vmware="required,max15,nospace">
+                                 </div>
+                              </div>
+                              <div class="row foraws">
+                                 <div class="col-lg-6 col-md-6 margintop20">
+                                    <span>
+                                    <label style="margin-bottom: 0px; vertical-align: middle; margin-top: 5px;">
+                                    Credentials:
+                                    <span style="color: Red;" class="control-label">&nbsp;*</span>
+                                    </label>
+                                    </span>
+                                    <span style="margin-right: 20px; margin-left: 20px;">
+                                    <input type="radio" name="isDefault" value="false"
+                                       style="vertical-align: middle;" id="credentials-accessKeys" checked>
+                                    <label for="credentials-accessKeys" style="margin-bottom:0px; margin-top: 5px; vertical-align: middle;">
+                                    Use access keys
+                                    </label>
+                                    </span>
+                                    <span style="margin-right: 20px;">
+                                    <input type="radio" name="isDefault" value="true"
+                                       style="vertical-align: middle;" id="credentials-IAMRole">
+                                    <label for="credentials-IAMRole" style="margin-bottom:0px; margin-top: 5px; vertical-align: middle;">
+                                    Use IAM role
+                                    </label>
+                                    <span>
+                                    <img class="tooltipMargin" data-toggle="popover" data-placement="left"
+                                       title="Credentials are not required if catalyst instance is launched with an IAM role which has permissions to launch instances" src="img/help.png"/>
+                                    </span>
+                                    </span>
+                                 </div>
+                              </div>
+                              <div class="row foraws aws-secret-info">
+                                 <div class="col-lg-6 col-md-6 margintop20">
+                                    <label for="">Access Key:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
+                                    <input name="accessKey" id="accessKey" class="form-control secretInfo" type="text" cdata="catalyst" cat-validation="required" placeholder="Enter the Access Key">
+                                 </div>
+                                 <div class="col-lg-6 col-md-6 margintop20">
+                                    <label for="">Secret Key:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
+                                    <input name="secretKey" id="secretKey" class="form-control secretInfo" type="text" cdata="catalyst" cat-validation="required" placeholder="Enter the Secret Key">
+                                 </div>
+                              </div>
+                              <div class="row forvmware">
+                                 <div class="col-lg-6 col-md-6 appNameLabel">
+                                    <label for="">Username:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
+                                    <input name="vmwareusername" id="vmwareusername" class="form-control" type="text" cdata="catalyst" cat-validation-vmware="required" placeholder="Enter Username">
+                                 </div>
+                                 <div class="col-lg-6 col-md-6 appNameLabel">
+                                    <label for="">Password:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
+                                    <input name="vmwarepassword" id="vmwarepassword" class="form-control secretInfo" type="password" cdata="catalyst" cat-validation-vmware="required" placeholder="Enter the Password">
+                                 </div>
+                                 <div class="col-lg-6 col-md-6 appNameLabel margintop20">
+                                    <label for="">Host:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
+                                    <input name="vmwarehost" id="vmwarehost" class="form-control" type="text" cdata="catalyst" cat-validation-vmware="required" placeholder="Enter the Host">
+                                 </div>
+                                 <div class="col-lg-6 col-md-6 appNameLabel margintop20">
+                                    <label for="">DC:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
+                                    <input name="vmwaredc" id="vmwaredc" class="form-control" type="text" cdata="catalyst" cat-validation-vmware="required" placeholder="Enter the Host">
+                                 </div>
+                              </div>
+                              <div class="row foropenstack">
+                                 <div class="col-lg-6 col-md-6 appNameLabel">
+                                    <label for="">Username:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
+                                    <input name="openstackusername" id="openstackusername" class="form-control" type="text" cdata="catalyst" cat-validation-openstack="required" placeholder="Enter Username">
+                                 </div>
+                                 <div class="col-lg-6 col-md-6 appNameLabel">
+                                    <label for="">Password:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
+                                    <input name="openstackpassword" id="openstackpassword" class="form-control secretInfo" type="password" cdata="catalyst" cat-validation-openstack="required" placeholder="Enter the Password">
+                                 </div>
+                                 <div class="col-lg-6 col-md-6 appNameLabel margintop20">
+                                    <label for="">Host:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
+                                    <input name="openstackhost" id="openstackhost" class="form-control" type="text" cdata="catalyst" cat-validation-openstack="required" placeholder="Enter the Host" onBlur="populateurls($(this));">
+                                 </div>
+                                 <div class="col-lg-6 col-md-6 appNameLabel margintop20">
+                                    <label for="">Project Name:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
+                                    <input name="openstackprojectname" id="openstackprojectname" class="form-control" type="text" cdata="catalyst" cat-validation-openstack="required" placeholder="Enter the Project Name">
+                                 </div>
+                                 <div class="col-lg-6 col-md-6 appNameLabel margintop20">
+                                    <label for="">Tenant ID:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
+                                    <input name="openstacktenantid" id="openstacktenantid" class="form-control" type="text" cdata="catalyst" cat-validation-openstack="required" placeholder="Enter the Host">
+                                 </div>
+                                 <div class="col-lg-6 col-md-6 appNameLabel margintop20">
+                                    <label for="">Tenant Name:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
+                                    <input name="openstacktenantname" id="openstacktenantname" class="form-control" type="text" cdata="catalyst" cat-validation-openstack="required" placeholder="Enter the Tenant Name">
+                                 </div>
+                                 <div class="col-lg-6 col-md-6 appNameLabel margintop20">
+                                    <label for="">Compute:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
+                                    <input name="openstackendpointcompute" id="openstackendpointcompute" class="form-control" type="text" cdata="catalyst" cat-validation-openstack="required" placeholder="Enter the Compute Service Endpoint">
+                                 </div>
+                                 <div class="col-lg-6 col-md-6 appNameLabel margintop20">
+                                    <label for="">Identity:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
+                                    <input name="openstackendpointidentity" id="openstackendpointidentity" class="form-control" type="text" cdata="catalyst" cat-validation-openstack="required" placeholder="Enter the Compute Service Endpoint">
+                                 </div>
+                                 <div class="col-lg-6 col-md-6 appNameLabel margintop20">
+                                    <label for="">Network:</label>
+                                    <input name="openstackendpointnetwork" id="openstackendpointnetwork" class="form-control" type="text" cdata="catalyst" placeholder="Enter the Network Service Endpoint" cat-validation-openstack="required">
+                                 </div>
+                                 <div class="col-lg-6 col-md-6 appNameLabel margintop20">
+                                    <label for="">Image:</label>
+                                    <input name="openstackendpointimage" id="openstackendpointimage" class="form-control" type="text" cdata="catalyst" placeholder="Enter the Image Service Endpoint" cat-validation-openstack="required">
+                                 </div>
+                                 <div class="col-lg-6 col-md-6 appNameLabel margintop20">
+                                    <label for="">Key Name:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
+                                    <input name="openstackkeyname" id="openstackkeyname" class="form-control" type="text" cat-validation-openstack="required" cdata="catalyst" placeholder="Enter Instance Key Name">
+                                 </div>
+                                 <div class="col-lg-6 col-md-6 appNameLabel margintop20">
+                                    <div class="smart-forms">
+                                       <label for="">Upload .pem file for Instance:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
+                                       <label for="openstackinstancepem" name="field" class="field file">
+                                          <div class="imgdiv" value="1"></div>
+                                          <span class="button btn-primary">Browse</span><input name="openstackinstancepem" id="openstackinstancepem" keyfield="configname" type="file" class="gui-file file" name="fileObject"><input type="text" readonly="" class="gui-input fileOPPem" name="fileName"><input type="text" class="folderpath" style="display:none;" cdata="catalyst"/>
                                        </label>
-                                       <span>
-                                       <img class="tooltipMargin" data-toggle="popover" data-placement="left"
-                                          title="Credentials are not required if catalyst instance is launched with an IAM role which has permissions to launch instances" src="img/help.png"/>
-                                       </span>
-                                       </span>
                                     </div>
                                  </div>
-                                 <div class="row foraws aws-secret-info">
-                                    <div class="col-lg-6 col-md-6 margintop20">
-                                       <span>
-                                       <input type="checkbox" style="vertical-align: middle;"
-                                          id="updateSecretInfo">
-                                       <label for="updateSecretInfo"
-                                          style="margin-bottom:0px; margin-top: 5px; vertical-align: middle;">
-                                       Update access credentials
+                              </div>
+                              <div class="row forhppubliccloud">
+                                 <div class="col-lg-6 col-md-6">
+                                    <label for="">Region:</label>
+                                    <select id="hppubliccloudregion" name="hppubliccloudregion" class="chooseOrganization width-100" style="vertical-align: central" cdata="catalyst" skiprowid="yes">
+                                       <option value="">Select Region</option>
+                                       <option value="region-a.geo-1.identity.hpcloudsvc.com">US West</option>
+                                       <option value="region-b.geo-1.identity.hpcloudsvc.com">US East</option>
+                                    </select>
+                                    <span data-val-controltovalidate="orgname" id="MainContent_Req_orgname" data-val="true" data-val-evaluationfunction="RequiredFieldValidatorEvaluateIsValid" data-val-initialvalue="" style="display:none;">Required</span>
+                                 </div>
+                                 <div class="col-lg-6 col-md-6">
+                                    <label for="">Key Name:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
+                                    <input name="hppubliccloudkeyname" id="hppubliccloudkeyname" class="form-control" type="text" cdata="catalyst" placeholder="Enter Instance Key Name">
+                                 </div>
+                                 <div class="col-lg-6 col-md-6 margintop20">
+                                    <div class="smart-forms">
+                                       <label for="">Upload .pem file for Instance:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
+                                       <label for="hpFileName" name="field" class="field file">
+                                          <div class="imgdiv" value="1"></div>
+                                          <span class="button btn-primary">Browse</span><input name="hpFileName" id="hpFileName" keyfield="configname" type="file" class="gui-file file" name="fileObject"><input type="text" readonly="" class="gui-input fileHPPem" name="fileName"><input type="text" class="folderpath" style="display:none;" cdata="catalyst" />
                                        </label>
-                                       </span>
                                     </div>
                                  </div>
-                                 <div class="row foraws aws-secret-info">
-                                    <div class="col-lg-6 col-md-6 margintop20">
-                                       <label for="">Access Key:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
-                                       <input name="accessKey" id="accessKey" class="form-control secretInfo" type="text" cdata="catalyst" cat-validation="required" placeholder="Enter the Access Key">
-                                    </div>
-                                    <div class="col-lg-6 col-md-6 margintop20">
-                                       <label for="">Secret Key:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
-                                       <input name="secretKey" id="secretKey" class="form-control secretInfo" type="text" cdata="catalyst" cat-validation="required" placeholder="Enter the Secret Key">
-                                    </div>
+                              </div>
+                              <div class="row forazure azureBlock">
+                                 <div class="col-lg-6 col-md-6 margintop20">
+                                    <label for="">Enter Subscription Id:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
+                                    <input name="azureSubscriptionId" id="azureSubscriptionId" class="form-control secretInfo" type="text" cdata="catalyst" cat-validation-azure="required" placeholder="Enter the Subscription Id">
                                  </div>
-                                 <div class="row forvmware">
-                                    <div class="col-lg-6 col-md-6 appNameLabel">
-                                       <label for="">Username:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
-                                       <input name="vmwareusername" id="vmwareusername" class="form-control" type="text" cdata="catalyst" cat-validation-vmware="required" placeholder="Enter Username">
-                                    </div>
-                                    <div class="col-lg-6 col-md-6 appNameLabel">
-                                       <label for="">Password:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
-                                       <input name="vmwarepassword" id="vmwarepassword" class="form-control secretInfo" type="password" cdata="catalyst" cat-validation-vmware="required" placeholder="Enter the Password">
-                                    </div>
-                                    <div class="col-lg-6 col-md-6 appNameLabel margintop20">
-                                       <label for="">Host:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
-                                       <input name="vmwarehost" id="vmwarehost" class="form-control" type="text" cdata="catalyst" cat-validation-vmware="required" placeholder="Enter the Host">
-                                    </div>
-                                    <div class="col-lg-6 col-md-6 appNameLabel margintop20">
-                                       <label for="">DC:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
-                                       <input name="vmwaredc" id="vmwaredc" class="form-control" type="text" cdata="catalyst" cat-validation-vmware="required" placeholder="Enter the Host">
-                                    </div>
+                                 <div class="col-lg-6 col-md-6 margintop20">
+                                    <label for="">Enter Client Id:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
+                                    <input name="azureClientId" id="azureClientId" class="form-control secretInfo" type="text" cdata="catalyst" cat-validation-azure="required" placeholder="Enter the Client Id">
                                  </div>
-                                 <div class="row foropenstack">
-                                    <div class="col-lg-6 col-md-6 appNameLabel">
-                                       <label for="">Username:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
-                                       <input name="openstackusername" id="openstackusername" class="form-control" type="text" cdata="catalyst" cat-validation-openstack="required" placeholder="Enter Username">
-                                    </div>
-                                    <div class="col-lg-6 col-md-6 appNameLabel">
-                                       <label for="">Password:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
-                                       <input name="openstackpassword" id="openstackpassword" class="form-control secretInfo" type="password" cdata="catalyst" cat-validation-openstack="required" placeholder="Enter the Password">
-                                    </div>
-                                    <div class="col-lg-6 col-md-6 appNameLabel margintop20">
-                                       <label for="">Host:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
-                                       <input name="openstackhost" id="openstackhost" class="form-control" type="text" cdata="catalyst" cat-validation-openstack="required" placeholder="Enter the Host" onBlur="populateurls($(this));">
-                                    </div>
-                                    <div class="col-lg-6 col-md-6 appNameLabel margintop20">
-                                       <label for="">Project Name:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
-                                       <input name="openstackprojectname" id="openstackprojectname" class="form-control" type="text" cdata="catalyst" cat-validation-openstack="required" placeholder="Enter the Project Name">
-                                    </div>
-                                    <div class="col-lg-6 col-md-6 appNameLabel margintop20">
-                                       <label for="">Tenant ID:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
-                                       <input name="openstacktenantid" id="openstacktenantid" class="form-control" type="text" cdata="catalyst" cat-validation-openstack="required" placeholder="Enter the Host">
-                                    </div>
-                                    <div class="col-lg-6 col-md-6 appNameLabel margintop20">
-                                       <label for="">Tenant Name:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
-                                       <input name="openstacktenantname" id="openstacktenantname" class="form-control" type="text" cdata="catalyst" cat-validation-openstack="required" placeholder="Enter the Tenant Name">
-                                    </div>
-                                    <div class="col-lg-6 col-md-6 appNameLabel margintop20">
-                                       <label for="">Compute:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
-                                       <input name="openstackendpointcompute" id="openstackendpointcompute" class="form-control" type="text" cdata="catalyst" cat-validation-openstack="required" placeholder="Enter the Compute Service Endpoint">
-                                    </div>
-                                    <div class="col-lg-6 col-md-6 appNameLabel margintop20">
-                                       <label for="">Identity:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
-                                       <input name="openstackendpointidentity" id="openstackendpointidentity" class="form-control" type="text" cdata="catalyst" cat-validation-openstack="required" placeholder="Enter the Compute Service Endpoint">
-                                    </div>
-                                    <div class="col-lg-6 col-md-6 appNameLabel margintop20">
-                                       <label for="">Network:</label>
-                                       <input name="openstackendpointnetwork" id="openstackendpointnetwork" class="form-control" type="text" cdata="catalyst" placeholder="Enter the Network Service Endpoint" cat-validation-openstack="required">
-                                    </div>
-                                    <div class="col-lg-6 col-md-6 appNameLabel margintop20">
-                                       <label for="">Image:</label>
-                                       <input name="openstackendpointimage" id="openstackendpointimage" class="form-control" type="text" cdata="catalyst" placeholder="Enter the Image Service Endpoint" cat-validation-openstack="required">
-                                    </div>
-                                    <div class="col-lg-6 col-md-6 appNameLabel margintop20">
-                                       <label for="">Key Name:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
-                                       <input name="openstackkeyname" id="openstackkeyname" class="form-control" type="text" cat-validation-openstack="required" cdata="catalyst" placeholder="Enter Instance Key Name">
-                                    </div>
-                                    <div class="col-lg-6 col-md-6 appNameLabel margintop20">
-                                       <div class="smart-forms">
-                                          <label for="">Upload .pem file for Instance:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
-                                          <label for="openstackinstancepem" name="field" class="field file">
-                                             <div class="imgdiv" value="1"></div>
-                                             <span class="button btn-primary">Browse</span><input name="openstackinstancepem" id="openstackinstancepem" keyfield="configname" type="file" class="gui-file file" name="fileObject"><input type="text" readonly="" class="gui-input fileOPPem" name="fileName"><input type="text" class="folderpath" style="display:none;" cdata="catalyst"/>
-                                          </label>
-                                       </div>
-                                    </div>
+                                 <div class="col-lg-6 col-md-6 margintop20">
+                                    <label for="">Enter Client Secret:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
+                                    <input name="azureClientSecret" id="azureClientSecret" class="form-control secretInfo" type="text" cdata="catalyst" cat-validation-azure="required" placeholder="Enter the Client Secret">
                                  </div>
-                                 <div class="row forhppubliccloud">
-                                    <div class="col-lg-6 col-md-6">
-                                       <label for="">Region:</label>
-                                       <select id="hppubliccloudregion" name="hppubliccloudregion" class="chooseOrganization width-100" style="vertical-align: central" cdata="catalyst" skiprowid="yes">
-                                          <option value="">Select Region</option>
-                                          <option value="region-a.geo-1.identity.hpcloudsvc.com">US West</option>
-                                          <option value="region-b.geo-1.identity.hpcloudsvc.com">US East</option>
-                                       </select>
-                                       <span data-val-controltovalidate="orgname" id="MainContent_Req_orgname" data-val="true" data-val-evaluationfunction="RequiredFieldValidatorEvaluateIsValid" data-val-initialvalue="" style="display:none;">Required</span>
-                                    </div>
-                                    <div class="col-lg-6 col-md-6">
-                                       <label for="">Key Name:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
-                                       <input name="hppubliccloudkeyname" id="hppubliccloudkeyname" class="form-control" type="text" cdata="catalyst" placeholder="Enter Instance Key Name">
-                                    </div>
-                                    <div class="col-lg-6 col-md-6 margintop20">
-                                       <div class="smart-forms">
-                                          <label for="">Upload .pem file for Instance:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
-                                          <label for="hpFileName" name="field" class="field file">
-                                             <div class="imgdiv" value="1"></div>
-                                             <span class="button btn-primary">Browse</span><input name="hpFileName" id="hpFileName" keyfield="configname" type="file" class="gui-file file" name="fileObject"><input type="text" readonly="" class="gui-input fileHPPem" name="fileName"><input type="text" class="folderpath" style="display:none;" cdata="catalyst" />
-                                          </label>
-                                       </div>
-                                    </div>
+                                 <div class="col-lg-6 col-md-6 margintop20">
+                                    <label for="">Enter Tenant Id:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
+                                    <input name="azureTenantId" id="azureTenantId" class="form-control secretInfo" type="text" cdata="catalyst" cat-validation-azure="required" placeholder="Enter the Tenant Id">
                                  </div>
-                                 <div class="row forazure azureBlock">
-                                    <div class="col-lg-6 col-md-6 margintop20">
-                                       <label for="">Enter Subscription Id:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
-                                       <input name="azureSubscriptionId" id="azureSubscriptionId" class="form-control secretInfo" type="text" cdata="catalyst" cat-validation-azure="required" placeholder="Enter the Subscription Id">
-                                    </div>
-                                    <div class="col-lg-6 col-md-6 margintop20">
-                                       <label for="">Enter Client Id:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
-                                       <input name="azureClientId" id="azureClientId" class="form-control secretInfo" type="text" cdata="catalyst" cat-validation-azure="required" placeholder="Enter the Client Id">
-                                    </div>
-                                    <div class="col-lg-6 col-md-6 margintop20">
-                                       <label for="">Enter Client Secret:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
-                                       <input name="azureClientSecret" id="azureClientSecret" class="form-control secretInfo" type="text" cdata="catalyst" cat-validation-azure="required" placeholder="Enter the Client Secret">
-                                    </div>
-                                    <div class="col-lg-6 col-md-6 margintop20">
-                                       <label for="">Enter Tenant Id:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
-                                       <input name="azureTenantId" id="azureTenantId" class="form-control secretInfo" type="text" cdata="catalyst" cat-validation-azure="required" placeholder="Enter the Tenant Id">
-                                    </div>
-                                    <div class="col-lg-6 col-md-6 margintop20">
-                                       <div class="smart-forms">
-                                          <label for="">Upload .pem file:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
-                                          <label for="azurepem" name="field" class="field file">
-                                             <div class="imgdiv" value="1"></div>
-                                             <span class="button btn-primary">Browse</span><input name="azurepem" id="azurepem" keyfield="configname" type="file" class="gui-file file" name="fileObject"><input type="text" readonly="" class="gui-input fileAzurePem" name="fileName"><input type="text" class="folderpath" style="display:none;" cdata="catalyst" />
-                                          </label>
-                                       </div>
-                                    </div>
-                                    <div class="col-lg-6 col-md-6 margintop20">
-                                       <div class="smart-forms">
-                                          <label for="">Upload private key file:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
-                                          <label for="azurekey" class="field file">
-                                             <div class="imgdiv" value="1"></div>
-                                             <span class="button btn-primary">Browse</span><input name="azurekey" id="azurekey" keyfield="configname" type="file" class="gui-file"><input type="text" readonly="" class="gui-input fileAzureKey" name="fileName">
-                                          </label>
-                                       </div>
+                                 <div class="col-lg-6 col-md-6 margintop20">
+                                    <div class="smart-forms">
+                                       <label for="">Upload .pem file:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
+                                       <label for="azurepem" name="field" class="field file">
+                                          <div class="imgdiv" value="1"></div>
+                                          <span class="button btn-primary">Browse</span><input name="azurepem" id="azurepem" keyfield="configname" type="file" class="gui-file file" name="fileObject"><input type="text" readonly="" class="gui-input fileAzurePem" name="fileName"><input type="text" class="folderpath" style="display:none;" cdata="catalyst" />
+                                       </label>
                                     </div>
                                  </div>
-                                 <div class="row">
-                                    <div class="col-lg-6 col-md-6 margintop20 foraws">
-                                       <label for="">S3 Bucket Name:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
-                                       <span>
-                                       <img data-toggle="popover" data-html="true" data-placement="left" title="S3 bucket to which AWS bills are delivered. NOTE: Detailed billing has to be enabled in AWS." src="img/help.png"/>
-                                       </span>
-                                       <input name="s3BucketName" id="s3BucketName" class="form-control" type="text" cdata="catalyst" cat-validation="required" placeholder="Enter the S3 Bucket Name">
-                                    </div>
-                                    <div class="col-lg-6 col-md-6 margintop20 foraws">
-                                       <label for="">Planned Cost:</label>
-                                       <span>
-                                       <img data-toggle="popover" data-html="true" data-placement="left" title="AWS Planned Cost for a Month." src="img/help.png"/>
-                                       </span>
-                                       <input name="plannedCost" id="plannedCost" class="form-control" type="text" cdata="catalyst" placeholder="Enter the Planned Cost">
+                                 <div class="col-lg-6 col-md-6 margintop20">
+                                    <div class="smart-forms">
+                                       <label for="">Upload private key file:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
+                                       <label for="azurekey" class="field file">
+                                          <div class="imgdiv" value="1"></div>
+                                          <span class="button btn-primary">Browse</span><input name="azurekey" id="azurekey" keyfield="configname" type="file" class="gui-file"><input type="text" readonly="" class="gui-input fileAzureKey" name="fileName">
+                                       </label>
                                     </div>
                                  </div>
-                                 <div class="row">
-                                    <div class="col-lg-6 col-md-6 margintop20">
-                                       <label for="name">Organization Name:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
-                                       <select id="orgId" name="orgId" class="form-control chooseOrganization width-100" style="vertical-align: central" cat-validation="required" cat-validation-openstack="required" cdata="catalyst" >
-                                          <option value="">Select Organization</option>
-                                       </select>
-                                    </div>
+                              </div>
+                              <div class="row">
+                                 <div class="col-lg-6 col-md-6 margintop20 foraws">
+                                    <label for="">S3 Bucket Name:</label>
+                                    <span>
+                                    <img data-toggle="popover" data-html="true" data-placement="left" title="S3 bucket to which AWS bills are delivered. NOTE: Detailed billing has to be enabled in AWS." src="img/help.png"/>
+                                    </span>
+                                    <input name="s3BucketName" id="s3BucketName" class="form-control" type="text" cdata="catalyst" placeholder="Enter the S3 Bucket Name">
+                                 </div>
+                                 <div class="col-lg-6 col-md-6 margintop20 foraws">
+                                    <label for="">Planned Cost:</label>
+                                    <span>
+                                    <img data-toggle="popover" data-html="true" data-placement="left" title="AWS Planned Cost for a Month." src="img/help.png"/>
+                                    </span>
+                                    <input name="plannedCost" id="plannedCost" class="form-control" type="text" cdata="catalyst" placeholder="Enter the Planned Cost">
+                                 </div>
+                              </div>
+                              <div class="row">
+                                 <div class="col-lg-6 col-md-6 margintop20">
+                                    <label for="name">Organization Name:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
+                                    <select id="orgId" name="orgId" class="form-control chooseOrganization width-100" style="vertical-align: central" cat-validation="required" cat-validation-openstack="required" cdata="catalyst" >
+                                       <option value="">Select Organization</option>
+                                    </select>
                                  </div>
                               </div>
-                              <!-- end widget div -->
                            </div>
-                           <!-- end widget -->
-                        </article>
-                        <!-- END COL -->
-                     </div>
-                     <!-- END ROW -->
-                  </section>
-                  <!-- end widget grid -->
-               </div>
-            </fieldset>
+                           <!-- end widget div -->
+                        </div>
+                        <!-- end widget -->
+                     </article>
+                     <!-- END COL -->
+                  </div>
+                  <!-- END ROW -->
+               </section>
+               <!-- end widget grid -->
+            </div>
+           </fieldset>
          </div>
-      </div>
-      <div class="btn-group pull-right">
-         <button  name="nextChef" id="nextChef" class="nextChef action-button" value="Next">Next</button>
+         <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>
+             <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="providerHiddenId">
+<input type="hidden" id="providerHiddenName">
 
 <script type="text/javascript" src="js/jquery.form.js"></script>
 <script>
-    function checkNestedSteps(providerStatus,imageStatus){
-        if(providerStatus === true && imageStatus === false){
-            $('li.providerCreate').removeClass('active');
-            $('li.imageCreate').addClass('active');
-        }else{
-            $('li.providerCreate').addClass('active');
-        }
-    }
-    var orgIdForSetup = $('#orgDropdown').find('option:selected').val();
-    var orgNameForSetup = $('#orgDropdown').find('option:selected').text();
-    var $option = $('<option></option>').val(orgIdForSetup).html(orgNameForSetup);
-    $('#orgId').append($option); 
-    var UtilityMethods = {
-        initTooltip: function() {
-            var $tool = $("[rel=tooltip]");
-            if ($tool.length) {
-                $tool.tooltip();
-            }
-        },
-        getRandomNumber: function() {
-            return parseInt(Math.random() * 10000000000);
-        },
-        getIdFromURL: function() {
-            var options = location.toString().split('?');
-            return options.length > 1 ? (options[1] !== "new" ? options[1] : "") : "";
-        },
-        initializeRegionlist: function() {
-            $('select.region').off('change').on('change', checkForKeyPair);
-        },
-        emptyRegion: function() {
-            $('select.region').val('').trigger('change');
-        },
-        emptyKeyPairs: function() {
-            $('select.keyvalue').html('<option value="">Choose Any Key Pair</option>');
-        },
-        triggerRegionChange: function() {},
-        providerChanged: function(pv) {
-            if (pv == 'AZURE') {
-                $('.foropenstack').hide();
-                $('.forhppubliccloud').hide();
-                $('.foraws').hide();
-                $('.addNewRegion').hide();
-                $('.forvmware').hide();
-                $('.forazure').show();
-                $('#myForm54').attr('action', $('#myForm54').attr('action').replace(/aws/g, 'azure'));
-                $('#myForm54').attr('action', $('#myForm54').attr('action').replace(/vmware/g, 'azure'));
-                $('#myForm54').attr('action', $('#myForm54').attr('action').replace(/openstack/g, 'azure'));
-                $('#myForm54').attr('action', $('#myForm54').attr('action').replace(/hppubliccloud/g, 'azure'));
-            } else if (pv == 'HPPUBLICCLOUD') {
-                $('.foropenstack').show();
-                $('.forhppubliccloud').show();
-                $('.foraws').hide();
-                $('.addNewRegion').hide();
-                $('.forvmware').hide();
-                $('.forazure').hide();
-                $('#openstackinstancepem').closest('div').hide();
-                $('#openstackkeyname').closest('div').hide();
-
-                $('#myForm54').attr('action', $('#myForm54').attr('action').replace(/aws/g, 'hppubliccloud'));
-                $('#myForm54').attr('action', $('#myForm54').attr('action').replace(/vmware/g, 'hppubliccloud'));
-                $('#myForm54').attr('action', $('#myForm54').attr('action').replace(/openstack/g, 'hppubliccloud'));
-                $('#myForm54').attr('action', $('#myForm54').attr('action').replace(/azure/g, 'hppubliccloud'));
-            } else if (pv == 'OPENSTACK') {
-                $('.foropenstack').show();
-                $('.forhppubliccloud').hide();
-                $('.foraws').hide();
-                $('.addNewRegion').hide();
-                $('.forvmware').hide();
-                $('.forazure').hide();
-                $('#openstackinstancepem').closest('div').show();
-                $('#openstackkeyname').closest('div').show();
-                $('#myForm54').attr('action', $('#myForm54').attr('action').replace(/aws/g, 'openstack'));
-                $('#myForm54').attr('action', $('#myForm54').attr('action').replace(/vmware/g, 'openstack'));
-                $('#myForm54').attr('action', $('#myForm54').attr('action').replace(/hppubliccloud/g, 'openstack'));
-                $('#myForm54').attr('action', $('#myForm54').attr('action').replace(/azure/g, 'openstack'));
-            } else if (pv == 'VMWARE') {
-                $('.foropenstack').hide();
-                $('.forhppubliccloud').hide();
-                $('.foraws').hide();
-                $('.forvmware').show();
-                $('.addNewRegion').hide();
-                $('.forazure').hide();
-                $('#myForm54').attr('action', $('#myForm54').attr('action').replace(/aws/g, 'vmware'));
-                $('#myForm54').attr('action', $('#myForm54').attr('action').replace(/openstack/g, 'vmware'));
-                $('#myForm54').attr('action', $('#myForm54').attr('action').replace(/hppubliccloud/g, 'vmware'));
-                $('#myForm54').attr('action', $('#myForm54').attr('action').replace(/azure/g, 'vmware'));
-            } else {
-                $('.foropenstack').hide();
-                $('.forhppubliccloud').hide();
-                $('.foraws').show();
-                $('.addNewRegion').show();
-                $('.forvmware').hide();
-                $('.forazure').hide();
-                $('#myForm54').attr('action', $('#myForm54').attr('action').replace(/openstack/g, 'aws'));
-                $('#myForm54').attr('action', $('#myForm54').attr('action').replace(/vmware/g, 'aws'));
-                $('#myForm54').attr('action', $('#myForm54').attr('action').replace(/hppubliccloud/g, 'aws'));
-                $('#myForm54').attr('action', $('#myForm54').attr('action').replace(/azure/g, 'aws'));
-            }
-        }
-    };
-
-    function populateurls($host) {
-        if ($('#providertype').val() == 'HPPUBLICCLOUD' && $host.val() != '') {
-            if ($('#openstackendpointec2').val() == '')
-                $('#openstackendpointec2').val($host.val());
-            if ($('#openstackendpointcompute').val() == '')
-                $('#openstackendpointcompute').val($host.val().replace('block', 'compute') + '/v2');
-            if ($('#openstackendpointidentity').val() == '')
-                $('#openstackendpointidentity').val($host.val().replace('block', 'identity') + ':35357/v2.0/');
-            if ($('#openstackendpointimage').val() == '')
-                $('#openstackendpointimage').val($host.val().replace('block', 'images') + ':443/v1.0');
-            if ($('#openstackendpointnetwork').val() == '')
-                $('#openstackendpointnetwork').val($host.val().replace('block', 'network') + '/v2.0');
-        }
-    }
-
-    function bindChange_importPemFile() {
-        $('input[type="file"]').off('change').on('change', function() {
-            $(this).next().val(this.files[0].name);
-            $(this).next().next().val($(this).val());
-        });
-    }
-
-    function inLineReady() {
-        $("input[type='text']").on("click", function() {
-            $(this).select();
-            $("#msgOrgName").hide();
-        });
-    }
-
-    inLineReady();
-
-    function appendLoader() {
-        removeLoader();
-        $("form[id*='myForm']").find("div.pull-right > input").attr('disabled', 'disabled').parent().prepend('<label id="masterssavespinner" class="" style="float:left;"><img  style="margin-left:5px;margin-right:25px;margin-top:8px;" src="img/select2-spinner.gif" /></label>');
-    }
-
-    function removeLoader() {
-        $('#masterssavespinner').remove();
-        $("form[id*='myForm']").find("div.pull-right > input").removeAttr('disabled');
-    }
-
-
-    function KeyChangeHandler(e) {
-        var accessKey = $('#accessKey').val().trim(),
-                secretKey = $('#secretKey').val().trim();
-        var providerId = UtilityMethods.getIdFromURL();
-        if ((accessKey && secretKey)) {
-            $('select.region').trigger('change');
-        } else if (providerId && providerId !== 'new') {
-            $('select.region').trigger('change');
-        } else {
-            UtilityMethods.emptyRegion();
-            UtilityMethods.emptyKeyPairs();
-        }
-    }
-
-    function checkForKeyPair(e) {
-        function loadKeyPair(accessKey, secretKey, isDefault, regionValue, providerId) {
-            appendLoader();
-            var data1 = new FormData();
-            if (!providerId) {
-                data1.append('accessKey', accessKey);
-                data1.append('secretKey', secretKey);
-                data1.append('region', regionValue);
-                data1.append('isDefault', isDefault);
-            } else if (providerId) {
-                data1.append('region', regionValue);
-                data1.append('isDefault', isDefault);
-                data1.append('providerId', providerId);
-            } else if(isDefault) {
-                data1.append('region', regionValue);
-                data1.append('isDefault', isDefault);
-            }
-
-            $.ajax({
-                method: "POST",
-                url: "/aws/providers/keypairs/list",
-                data: data1,
-                processData: false,
-                contentType: false,
-                error: function(XMLHttpRequest, textStatus, errorThrown) {
-                    $('.modal-dialog').find('.close').trigger('click');
-                    bootbox.alert(XMLHttpRequest.responseText);
-                    $('#btnsubmit').attr('disabled', 'disabled');
-                    $region.parents('.addNewRegion').find('select.keyvalue').html('<option value=""> Select Keypair</option>').val("");
-                    removeLoader();
-                }
-            }).done(function(msg) {
-                var str = '<option value="">Choose Any Key Pair</option>',
-                        val = msg['KeyPairs'],
-                        len = val.length;
-                for (var i = 0; i < len; i++) {
-                    str = str + '<option value="' + val[i].KeyName + '">' + val[i].KeyName + '</option>';
-                }
-                $region.parents('.addNewRegion').find('select.keyvalue').html(str).val('').each(function() {
-                    $(this).attr('answer') ? $(this).val($(this).attr('answer')) : "";
-                });
-                $('#btnsubmit').removeAttr('disabled');
-                removeLoader();
-            });
-        }
-
-        var accessKey = $('#accessKey').val(),
-                secretKey = $('#secretKey').val(),
-                $region = $(this);
-        region = $region.val();
-        var providerId = UtilityMethods.getIdFromURL();
-        var isDefault = $("input[name='isDefault']:checked").val();
-
-        if(providerId && providerId != 'new' && region && region !== '') {
-            loadKeyPair(null, null, false, region, providerId);
-        } else if(accessKey && secretKey && accessKey !== '' && secretKey !== ''
-                && region && region !== '') {
-            loadKeyPair(accessKey, secretKey, false, region, null);
-        } else if(isDefault && region && region != '') {
-            loadKeyPair(null, null, true, region, null);
-        } else {
-            $('#btnsubmit').attr('disabled', 'disabled');
-        }
-
-    }
-
-    $(document).ready(function() {
-
-        var $secretInfo  = $('.secretInfo');
-        var $awsInputs = $secretInfo.filter('[cat-validation]');
-        var $vmwareInputs = $secretInfo.filter('[cat-validation-vmware]');
-        var $azureInputs = $secretInfo.filter('[cat-validation-azure]');
-        var $openStack = $secretInfo.filter('[cat-validation-openstack]');
-
-        $("input[name='isDefault']").change(function() {
-            if ($("#credentials-IAMRole").is(":checked")) {
-                $('.aws-secret-info').hide();
-                $secretInfo.removeAttr('cat-validation');
-                $secretInfo.attr('disabled', 'disabled');
-            } else {
-                $('.aws-secret-info').show();
-                $secretInfo.prop('cat-validation', 'required');
-                $secretInfo.removeAttr('disabled');
-            }
-        });
-
-        $('#updateSecretInfo').change(function() {
-            if (this.checked) {
-                $secretInfo.removeAttr('disabled');
-                $awsInputs.attr('cat-validation', 'required');
-                $vmwareInputs.attr('cat-validation-vmware', 'required');
-                $azureInputs.attr('cat-validation-azure', 'required');
-                $openStack.attr('cat-validation-openstack', 'required');
-               // loadKeyPair(null, null, false, region, providerId);
-            } else {
-
-                $secretInfo.attr('disabled', 'disabled');
-                $secretInfo.removeAttr('cat-validation').removeAttr('cat-validation-vmware').removeAttr('cat-validation-azure').removeAttr('cat-validation-openstack');
-                $secretInfo.val('');
-            }
-        });
-
-        $("input[type='password']").val('');
-        $("#name").focus();
-        $('#accessKey').blur(KeyChangeHandler);
-        $('#secretKey').blur(KeyChangeHandler);
-
-        $('#providertype').val('AWS').trigger('change');
-        $('#myForm54').ajaxForm({
-            beforeSubmit: function(arr, $form, options) {
-                if (location.toString().indexOf('?new') === -1 && $('#providertype').val() == 'AZURE') {
-                    var azureSubscriptionId = $('#azureSubscriptionId').val();
-                    arr.push({name:'azureSubscriptionId',value:orgValue,type:'text',required:false})
-                }
-                // return false to cancel submit
-                if ($('#providertype').val() == 'OPENSTACK' || $('#providertype').val() == 'HPPUBLICCLOUD') {
-                    if (isFormValidOpenStack(null, 'cat-validation-openstack')) {
-                        appendLoader();
-                        return true;
-                    } else
-                        return false;
-                } else if ($('#providertype').val() == 'VMWARE') {
-                    if (isFormValidOpenStack(null, 'cat-validation-vmware')) {
-                        appendLoader();
-                        return true;
-                    } else
-                        return false;
-                } else if ($('#providertype').val() == 'AZURE') {
-                    if (isFormValidAzure(null, 'cat-validation-azure')) {
-                        appendLoader();
-                        return true;
-                    } else
-                        return false;
-                } else {
-                    if (isFormValid()) {
-                        console.log(arr);
-                        appendLoader();
-                        return true;
-                    } else {
-                        return false;
+   var orgIdForSetup = $('#orgDropdown').find('option:selected').val();
+   var orgNameForSetup = $('#orgDropdown').find('option:selected').text();
+   var $option = $('<option></option>').val(orgIdForSetup).html(orgNameForSetup);
+   var providerIdForImage;
+   $('#orgId').append($option);
+   $(document).ready(function(e) {
+       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>');
+       $('.wizardFlow').append(providerWizardFlow);
+
+       function getProviderValues() {
+           $.get('/aws/providers/list', function(data) {
+               for (var i = 0; i < data.length; i++) {
+                   if (orgIdForSetup === data[i].orgId[0]) {
+                       $('#providerHiddenName').val(data[i].providerName);
+                       $('#myForm54').find('select#providerType').val(data[i].providerType.toLowerCase());
+                       $('#providertype').trigger('change').attr('disabled', 'disabled');
+                       $('#myForm54').find('input#name').val(data[i].providerName).attr('disabled', 'disabled');
+                       $('#myForm54').find('input#s3BucketName').val(data[i].s3BucketName).attr('disabled', 'disabled');
+                       $('#myForm54').find('input#plannedCost').val(data[i].plannedCost).attr('disabled', 'disabled');
+                       $('#orgId').val(data[i].orgId[0]).attr('disabled', 'disabled');
+                       var createTemplateInstance = new createTemplate($('#appender'));
+                       for (var j = 0; j < data[i].keyPairs.length; j++) {
+                           var $authPemFile = $('.authPemFile');
+                           $authPemFile.find('input.filename').val(data[i].keyPairs[j].fileName).attr('disabled', 'disabled');
+                           $('#myForm54').find('select.regionValue').val(data[i].keyPairs[j].region).attr('disabled', 'disabled');
+                           $('#myForm54').find('select.keySecretValue').remove();
+                           $('#myForm54').find('input#keySecretValue').removeClass('hidden').val(data[i].keyPairs[j].keyPairName).attr('disabled', 'disabled');
+                           $('#myForm54').find('select.keyRegionValue').remove();
+                           $('#myForm54').find('input#keyRegionValue').removeClass('hidden').val(data[i].keyPairs[j].region).attr('disabled', 'disabled');
+                           $('#providerHiddenId').val(data[i].keyPairs[j].providerId);
+                       }
+
+                       $("input[name='isDefault'][value=" + data[i].isDefault + "]").attr('checked', true);
+                       $("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');
+                   }
+               }
+           });
+       }
+
+       function getVmImages() {
+        var providerIdForImage = $('#providerHiddenId').val();
+        var providerNameForImage = $('#providerHiddenName').val();
+         $('#myForm22').find('select#orgId').empty();
+           $.get('/vmimages', function(data) {
+                for(var i =0;i<data.length;i++){
+                  if (orgIdForSetup === data[i].orgId[0]) {
+                    if(providerIdForImage === data[i].providerId){
+                    var $option = $('<option></option>').val(orgIdForSetup).html(orgNameForSetup);
+                    $('#myForm22').find('select#orgId').append($option).attr('disabled','disabled');
+                    var $optionForOs = $('<option></option>').val(data[i].osName).html(data[i].osName);
+                    
+                      $('#myForm22').find('select.providerVMImageDisplay').remove();
+                      $('#myForm22').find('input.imageNameForVM').val(data[i].name).attr('disabled','disabled');
+                      $('#myForm22').find('input#providerIdHiddenName').removeClass('hidden').val(providerNameForImage);
+                      $('#myForm22').find('select#osType').remove();
+                      $('#myForm22').find('input#osType').removeClass('hidden').val(data[i].osName);
+                      $('#myForm22').find('input#imageidentifire').val(data[i].imageIdentifier).attr('disabled','disabled');
+                      $('#myForm22').find('input#UserName').val(data[i].userName).attr('disabled','disabled');
+                      $('.btn-3 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
                     }
+                  }
                 }
-            },
-            dataType: 'json',
-            success: function(data, success) {
-                if (data != 500) {
-                    if ($('#btncancel').length) {
-                        $('#btncancel').click();
-                    }
-                } else {
-                    alert(data.toString());
-                }
-                removeLoader();
-            },
-            error: function(jqxhr) {
-                removeLoader();
-                console.log(jqxhr);
-                if (jqxhr.status == 409) {
-                    errormessageforInput('name', jqxhr.responseText);
-                } else {
-                    // bootbox.alert(jqxhr.status + " :: " + jqxhr.responseText);
-                    bootbox.alert(jqxhr.responseText);
-                }
-            },
-            failure: function(data) {
-                removeLoader();
-                console.log(jqxhr);
-                if (jqxhr.status == 409) {
-                    errormessageforInput('name', jqxhr.responseText);
-                } else {
-                    // bootbox.alert(jqxhr.status + " :: " + jqxhr.responseText);
-                    bootbox.alert(jqxhr.responseText);
-                }
-            }
-        });
-    });
-
-    if (!UtilityMethods.getIdFromURL()) {
-            
-            var createTemplateInstance = new createTemplate($('#appender'));
-            $('#appender').append(createTemplateInstance.getFinalTemplate(true));
-            bindChange_importPemFile();
-            
-            $('#myForm54').attr('action', '/aws/providers');
-            getRegionList();
-            $('select.region').change(checkForKeyPair);
-            $('#openstackinstancepem').attr('cat-validation-openstack','required');
-        }
-
-    function getRegionList() {
-        $.get('/vmimages/regions/list', function(data) {
-            var str = '<option value="">Select Region</option>';
-            for (var i = 0; i < data.length; i++) {
-                str = str + '<option value="' + data[i].region + '">' + data[i].region_name + ' | ' + data[i].region + '</option>'
-            }
-            UtilityMethods.initializeRegionlist();
-
-            $('select.region').each(function() {
-                if (!$(this).val()) {
-                    $(this).html(str);
-                }
-            }).each(function() {
-                $(this).attr('answer') ? $(this).val($(this).attr('answer')) : "";
-                if ($(this).attr('disabled')) {
-                    $(this).trigger('change');
-                }
-            });
-        });
-    }
-
-    function createTemplate(parentToAttach) {
-        var that = this,
-                parentEl = $(parentToAttach).addClass('customTemplateParent');
-        var getAddButton = function(classs) {
-                    var title = ''
-                    if (classs == 'addRegion') {
-                        titile = 'title="Add New Region" data-placement="top"';
-                    } else if (classs == 'addRow') {
-                        titile = 'title="Add New Key Pair" data-placement="top"';
-                    }
-                    return '<img src="img/add.png" class="addimage ' + (classs ? classs : '') + '" ' + titile + ' rel="tooltip" data-placement="top" />'
-                },
-
-                getRemoveButton = function(classs) {
-                    var title = ''
-                    if (classs == 'removeRegion') {
-                        titile = 'title="Remove this Region" data-placement="top"';
-                    } else if (classs == 'removeRow') {
-                        titile = 'title="Remove this Key Pair" data-placement="top"';
-                    }
-                    return '<img src="img/remove.png" class="removeimage ' + (classs ? classs : '') + '" ' + titile + ' rel="tooltip"  />'
-                },
-                getKeyValueList = function() {
-                    return '<div class="col-lg-6 col-md-6 margintop20" style="width:47%;">' + '<label for="name">Select Key Pair:<span class="control-label redSpan">&nbsp;*</span></label>' + '<select id="' + UtilityMethods.getRandomNumber() + '" name="keyPairName" unique="true" uniqueconditionedby="orgname"  class="form-control chooseOrganization width-100 keyvalue secretInfo" ' + 'style="vertical-align:central" cat-validation="required" skiprowid="yes" cdata="catalyst">' + '  <option value="">Select Any Key Pair</option></select>' + '</div>';
-                };
-        var getRegion = function() {
-            return '<div class="row">' + '<div class="col-lg-6 col-md-6" style="width:47%">' + '<label for="name">Region:<span class="control-label redSpan">&nbsp;*</span></label>' + '<select id="' + UtilityMethods.getRandomNumber() + '" name="region" unique="true" uniqueconditionedby="orgname"  class="form-control region chooseOrganization width-100 secretInfo" style="' + 'vertical-align:central" cat-validation="required" skiprowid="yes" cdata="catalyst">' + '<option value="">Select Region</option>' + '<option value="us-west-2">us-west-2</option>' + '</select>' + '</div></div>';
-        };
-        var getPemFileRow = function() {
-            return '<div class="col-lg-6 col-md-6 authPemFile margintop20" style="display: block;"><div class="smart-forms" style="  margin-left: 7%;"><label for="">Upload .pem file for Provider<span class="control-label redSpan">&nbsp;*</span></label>' + '<label for="templatesicon" name="field" class="file">' + '<span class="button btn-primary btn-importbyIP" style="height:26px;line-height:22px;  padding: 1px ' + '14px;position: absolute;right:4px;margin-top: 4.5%;">Browse</span>' + '<input id="' + UtilityMethods.getRandomNumber() + '" type="file" class="gui-file file secretInfo" cdata="catalyst" cat-validation="required" name="fileObject">' + '<input type="text" readonly="" class="gui-input filename" name="fileName">' + '<input type="text" class="folderpath" style="display:none;" cdata="catalyst" />' + '</label></div></div>';
-        };
-
-        this.getRow = function(isAdd, isRemove, notrequired) {
-            var str = '';
-            if (isAdd) {
-                str = getAddButton('addRow');
-            } else if (isRemove) {
-                str = getRemoveButton('removeRow');
-            } else if (notrequired) {
-                str = '';
-            }
-            return '<div class="row pemrow">' + getKeyValueList() + getPemFileRow() + str + '</div>';
-        };
-
-        this.getFinalTemplate = function(isAddApplicable, noOfRow) {
-            noOfRow = noOfRow ? parseInt(noOfRow) : 1;
-            var str = '';
-            for (var i = 0; i < noOfRow; i++) {
-                if (i == 0) {
-                    str = str + that.getRow(false, false, false);
-                } else {
-                    str = str + that.getRow(false, false, false);
-                }
-
-            }
-            return '<div class="addNewRegion margintop20">' + (isAddApplicable ? getAddButton('addRegion') : getRemoveButton('removeRegion')) + getRegion() + str + '</div>'
-        };
-
-        $(parentEl).delegate('.addimage', 'click', function() {
-            if ($(this).hasClass('addRow')) {
-                $(this).parent().parent().append(that.getRow(false, true)).find('select');
-            } else if ($(this).hasClass('addRegion')) {
-                $(this).parents('.customTemplateParent').append(that.getFinalTemplate()).find('select');
-                getRegionList();
-            }
-            UtilityMethods.initTooltip();
-            bindChange_importPemFile();
-        });
-
-        $(parentEl).delegate('.removeimage', 'click', function() {
-            var parent = $(this).parent();
-            if ($(this).hasClass('removeRow')) {
-
-                parent.remove();
-
-            } else if ($(this).hasClass('removeRegion') && !parent.find('select.keyvalue').attr('keyID')) {
-
-                parent.remove();
-            } else {
-                bootbox.confirm('You are about to remove this KeyPair <strong>' + parent.find('select.keyvalue').val() + '</strong>', function(result) {
-                    if (result) {
-                        $.ajax({
-                            type: "delete",
-                            dataType: "text",
-                            async: false,
-                            url: "/aws/providers/keypairs/" + parent.find('select.keyvalue').attr('keyID'),
-                            success: function(data) {
-                                if (data != '401') {
-                                    parent.remove();
-                                } else {
-                                    bootbox.alert('Insufficient permission to perform this operation.');
-                                }
-                            },
-                            failure: function(data) {
-                                bootbox.alert(data.responseText);
-                            },
-                            error: function(data) {
-                                bootbox.alert(data.responseText);
-                            }
-                        });
-                    }
-                });
-            }
-            UtilityMethods.initTooltip();
-        });
-    }
-
-</script>
-<script>
-    //jQuery time
-    var current_fs, next_fs, previous_fs; //fieldsets
-    var left, opacity, scale; //fieldset properties which we will animate
-    var animating; //flag to prevent quick multi-click glitches    
-    $(".nextChef").click(function(){
-        $('.content').load('ajax/Settings/vmImageWizard.html');
-        if(animating) return false;
-        animating = true;
-
-        current_fs = $(this).parent();
-        next_fs = $(this).parent().next();
-
-        //activate next step on progressbar using the index of next_fs
-        $("#progressbar li").eq($("div form").index(next_fs)).addClass("active");
-        //show the next fieldset
-        next_fs.show();
-        //hide the current fieldset with style
-        current_fs.animate({opacity: 0}, {
-            step: function(now, mx) {
-                //as the opacity of current_fs reduces to 0 - stored in "now"
-                //1. scale current_fs down to 80%
-                scale = 1 - (1 - now) * 0.2;
-                //2. bring next_fs from the right(50%)
-                left = (now * 50)+"%";
-                //3. increase opacity of next_fs to 1 as it moves in
-                opacity = 1 - now;
-                current_fs.css({'transform': 'scale('+scale+')'});
-                next_fs.css({'left': left, 'opacity': opacity});
-            },
-            duration: 800,
-            complete: function(){
-                current_fs.hide();
-                animating = false;
-            },
-            //this comes from the custom easing plugin
-            easing: 'easeInOutBack'
-        });
-    });
-
-    $(".previous").click(function(){
-        if(animating) return false;
-        animating = true;
-
-        current_fs = $(this).parent();
-        previous_fs = $(this).parent().prev();
-
-        //de-activate current step on progressbar
-        $("#progressbar li").eq($("form").index(current_fs)).removeClass("active");
-
-        //show the previous fieldset
-        previous_fs.show();
-        //hide the current fieldset with style
-        current_fs.animate({opacity: 0}, {
-            step: function(now, mx) {
-                //as the opacity of current_fs reduces to 0 - stored in "now"
-                //1. scale previous_fs from 80% to 100%
-                scale = 0.8 + (1 - now) * 0.2;
-                //2. take current_fs to the right(50%) - from 0%
-                left = ((1-now) * 50)+"%";
-                //3. increase opacity of previous_fs to 1 as it moves in
-                opacity = 1 - now;
-                current_fs.css({'left': left});
-                previous_fs.css({'transform': 'scale('+scale+')', 'opacity': opacity});
-            },
-            duration: 800,
-            complete: function(){
-                current_fs.hide();
-                animating = false;
-            },
-            //this comes from the custom easing plugin
-            easing: 'easeInOutBack'
-        });
-    });
+           });
+       }
+       $('.btn-2 a').click(function(e) {
+           e.preventDefault();
+           clicked = false;
+           $('.contentSetting').load(this.getAttribute('href'));
+       });
+       $('.btn-3 a').click(function(e) {
+           e.preventDefault();
+           getVmImages();
+           $('.btn-2 a').parent('.bwizard-steps li').removeClass('active')
+           $(this).parent('.bwizard-steps li').addClass('active');
+           $('.content').load(this.getAttribute('href'));
+       });
+       //api call for getting the status of wizard
+       if (clicked) {
+          if(orgIdForSetup){
+              $('#wizardActionListLoader').show();
+              $.get('/setting-wizard/org/' + orgIdForSetup, function(data) {
+               if (data.currentStep.name === 'Provider Configuration') {
+                   if (data.currentStep.nestedSteps) {
+                       var nestedSteps = data.currentStep.nestedSteps;
+                       if (nestedSteps[0].name === 'Provider' && nestedSteps[0].isCompleted === true &&
+                            nestedSteps[1].name === 'VMImage' && nestedSteps[1].isCompleted === false) {
+                           $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
+                            $('.btn-3 a').removeClass('not-activeAnchor');
+                           $('.contentSetting').find('ol li#imageCreate').addClass('active');
+                           $('.content').load('ajax/Settings/vmImageWizard.html');
+                       } else {
+                       }
+                   }
+               } else {
+                   getProviderValues();
+                   $('.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();
+       } else {
+           getProviderValues();
+           $('.btn-3 a').removeClass('not-activeAnchor');
+           $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
+       }
+   });
+
+
+   var UtilityMethods = {
+       initTooltip: function() {
+           var $tool = $("[rel=tooltip]");
+           if ($tool.length) {
+               $tool.tooltip();
+           }
+       },
+       getRandomNumber: function() {
+           return parseInt(Math.random() * 10000000000);
+       },
+       getIdFromURL: function() {
+           var options = location.toString().split('?');
+           return options.length > 1 ? (options[1] !== "new" ? options[1] : "") : "";
+       },
+       initializeRegionlist: function() {
+           $('select.region').off('change').on('change', checkForKeyPair);
+       },
+       emptyRegion: function() {
+           $('select.region').val('').trigger('change');
+       },
+       emptyKeyPairs: function() {
+           $('select.keyvalue').html('<option value="">Choose Any Key Pair</option>');
+       },
+       triggerRegionChange: function() {},
+       providerChanged: function(pv) {
+           if (pv == 'AZURE') {
+               $('.foropenstack').hide();
+               $('.forhppubliccloud').hide();
+               $('.foraws').hide();
+               $('.addNewRegion').hide();
+               $('.forvmware').hide();
+               $('.forazure').show();
+               $('#myForm54').attr('action', $('#myForm54').attr('action').replace(/aws/g, 'azure'));
+               $('#myForm54').attr('action', $('#myForm54').attr('action').replace(/vmware/g, 'azure'));
+               $('#myForm54').attr('action', $('#myForm54').attr('action').replace(/openstack/g, 'azure'));
+               $('#myForm54').attr('action', $('#myForm54').attr('action').replace(/hppubliccloud/g, 'azure'));
+           } else if (pv == 'HPPUBLICCLOUD') {
+               $('.foropenstack').show();
+               $('.forhppubliccloud').show();
+               $('.foraws').hide();
+               $('.addNewRegion').hide();
+               $('.forvmware').hide();
+               $('.forazure').hide();
+               $('#openstackinstancepem').closest('div').hide();
+               $('#openstackkeyname').closest('div').hide();
+
+               $('#myForm54').attr('action', $('#myForm54').attr('action').replace(/aws/g, 'hppubliccloud'));
+               $('#myForm54').attr('action', $('#myForm54').attr('action').replace(/vmware/g, 'hppubliccloud'));
+               $('#myForm54').attr('action', $('#myForm54').attr('action').replace(/openstack/g, 'hppubliccloud'));
+               $('#myForm54').attr('action', $('#myForm54').attr('action').replace(/azure/g, 'hppubliccloud'));
+           } else if (pv == 'OPENSTACK') {
+               $('.foropenstack').show();
+               $('.forhppubliccloud').hide();
+               $('.foraws').hide();
+               $('.addNewRegion').hide();
+               $('.forvmware').hide();
+               $('.forazure').hide();
+               $('#openstackinstancepem').closest('div').show();
+               $('#openstackkeyname').closest('div').show();
+               $('#myForm54').attr('action', $('#myForm54').attr('action').replace(/aws/g, 'openstack'));
+               $('#myForm54').attr('action', $('#myForm54').attr('action').replace(/vmware/g, 'openstack'));
+               $('#myForm54').attr('action', $('#myForm54').attr('action').replace(/hppubliccloud/g, 'openstack'));
+               $('#myForm54').attr('action', $('#myForm54').attr('action').replace(/azure/g, 'openstack'));
+           } else if (pv == 'VMWARE') {
+               $('.foropenstack').hide();
+               $('.forhppubliccloud').hide();
+               $('.foraws').hide();
+               $('.forvmware').show();
+               $('.addNewRegion').hide();
+               $('.forazure').hide();
+               $('#myForm54').attr('action', $('#myForm54').attr('action').replace(/aws/g, 'vmware'));
+               $('#myForm54').attr('action', $('#myForm54').attr('action').replace(/openstack/g, 'vmware'));
+               $('#myForm54').attr('action', $('#myForm54').attr('action').replace(/hppubliccloud/g, 'vmware'));
+               $('#myForm54').attr('action', $('#myForm54').attr('action').replace(/azure/g, 'vmware'));
+           } else {
+               $('.foropenstack').hide();
+               $('.forhppubliccloud').hide();
+               $('.foraws').show();
+               $('.addNewRegion').show();
+               $('.forvmware').hide();
+               $('.forazure').hide();
+               $('#myForm54').attr('action', $('#myForm54').attr('action').replace(/openstack/g, 'aws'));
+               $('#myForm54').attr('action', $('#myForm54').attr('action').replace(/vmware/g, 'aws'));
+               $('#myForm54').attr('action', $('#myForm54').attr('action').replace(/hppubliccloud/g, 'aws'));
+               $('#myForm54').attr('action', $('#myForm54').attr('action').replace(/azure/g, 'aws'));
+           }
+       }
+   };
+
+   function populateurls($host) {
+       if ($('#providertype').val() == 'HPPUBLICCLOUD' && $host.val() != '') {
+           if ($('#openstackendpointec2').val() == '')
+               $('#openstackendpointec2').val($host.val());
+           if ($('#openstackendpointcompute').val() == '')
+               $('#openstackendpointcompute').val($host.val().replace('block', 'compute') + '/v2');
+           if ($('#openstackendpointidentity').val() == '')
+               $('#openstackendpointidentity').val($host.val().replace('block', 'identity') + ':35357/v2.0/');
+           if ($('#openstackendpointimage').val() == '')
+               $('#openstackendpointimage').val($host.val().replace('block', 'images') + ':443/v1.0');
+           if ($('#openstackendpointnetwork').val() == '')
+               $('#openstackendpointnetwork').val($host.val().replace('block', 'network') + '/v2.0');
+       }
+   }
+
+   function bindChange_importPemFile() {
+       $('input[type="file"]').off('change').on('change', function() {
+           $(this).next().val(this.files[0].name);
+           $(this).next().next().val($(this).val());
+       });
+   }
+
+   function inLineReady() {
+       $("input[type='text']").on("click", function() {
+           $(this).select();
+           $("#msgOrgName").hide();
+       });
+   }
+
+   inLineReady();
+
+   function appendLoader() {
+       removeLoader();
+       $("form[id*='myForm']").find("div.pull-right > input").attr('disabled', 'disabled').parent().prepend('<label id="masterssavespinner" class="" style="float:left;"><img  style="margin-left:5px;margin-right:25px;margin-top:8px;" src="img/select2-spinner.gif" /></label>');
+   }
+
+   function removeLoader() {
+       $('#masterssavespinner').remove();
+       $("form[id*='myForm']").find("div.pull-right > input").removeAttr('disabled');
+   }
+
+
+   function KeyChangeHandler(e) {
+       var accessKey = $('#accessKey').val().trim(),
+           secretKey = $('#secretKey').val().trim();
+       var providerId = UtilityMethods.getIdFromURL();
+       if ((accessKey && secretKey)) {
+           $('select.region').trigger('change');
+       } else if (providerId && providerId !== 'new') {
+           $('select.region').trigger('change');
+       } else {
+           UtilityMethods.emptyRegion();
+           UtilityMethods.emptyKeyPairs();
+       }
+   }
+
+   function checkForKeyPair(e) {
+       function loadKeyPair(accessKey, secretKey, isDefault, regionValue, providerId) {
+           appendLoader();
+           var data1 = new FormData();
+           if (!providerId) {
+               data1.append('accessKey', accessKey);
+               data1.append('secretKey', secretKey);
+               data1.append('region', regionValue);
+               data1.append('isDefault', isDefault);
+           } else if (providerId) {
+               data1.append('region', regionValue);
+               data1.append('isDefault', isDefault);
+               data1.append('providerId', providerId);
+           } else if (isDefault) {
+               data1.append('region', regionValue);
+               data1.append('isDefault', isDefault);
+           }
+
+           $.ajax({
+               method: "POST",
+               url: "/aws/providers/keypairs/list",
+               data: data1,
+               processData: false,
+               contentType: false,
+               error: function(XMLHttpRequest, textStatus, errorThrown) {
+                   $('.modal-dialog').find('.close').trigger('click');
+                   bootbox.alert(XMLHttpRequest.responseText);
+                   $('#btnsubmit').attr('disabled', 'disabled');
+                   $region.parents('.addNewRegion').find('select.keyvalue').html('<option value=""> Select Keypair</option>').val("");
+                   removeLoader();
+               }
+           }).done(function(msg) {
+               var str = '<option value="">Choose Any Key Pair</option>',
+                   val = msg['KeyPairs'],
+                   len = val.length;
+               for (var i = 0; i < len; i++) {
+                   str = str + '<option value="' + val[i].KeyName + '">' + val[i].KeyName + '</option>';
+               }
+               $region.parents('.addNewRegion').find('select.keyvalue').html(str).val('').each(function() {
+                   $(this).attr('answer') ? $(this).val($(this).attr('answer')) : "";
+               });
+               $('#btnsubmit').removeAttr('disabled');
+               removeLoader();
+           });
+       }
+
+       var accessKey = $('#accessKey').val(),
+           secretKey = $('#secretKey').val(),
+           $region = $(this);
+       region = $region.val();
+       var providerId = UtilityMethods.getIdFromURL();
+       var isDefault = $("input[name='isDefault']:checked").val();
+
+       if (providerId && providerId != 'new' && region && region !== '') {
+           loadKeyPair(null, null, false, region, providerId);
+       } else if (accessKey && secretKey && accessKey !== '' && secretKey !== '' &&
+           region && region !== '') {
+           loadKeyPair(accessKey, secretKey, false, region, null);
+       } else if (isDefault && region && region != '') {
+           loadKeyPair(null, null, true, region, null);
+       } else {
+           $('#btnsubmit').attr('disabled', 'disabled');
+       }
+
+   }
+
+   $(document).ready(function() {
+
+       var $secretInfo = $('.secretInfo');
+       var $awsInputs = $secretInfo.filter('[cat-validation]');
+       var $vmwareInputs = $secretInfo.filter('[cat-validation-vmware]');
+       var $azureInputs = $secretInfo.filter('[cat-validation-azure]');
+       var $openStack = $secretInfo.filter('[cat-validation-openstack]');
+
+       $("input[name='isDefault']").change(function() {
+           if ($("#credentials-IAMRole").is(":checked")) {
+               $('.aws-secret-info').hide();
+               $secretInfo.removeAttr('cat-validation');
+               $secretInfo.attr('disabled', 'disabled');
+           } else {
+               $('.aws-secret-info').show();
+               $secretInfo.prop('cat-validation', 'required');
+               $secretInfo.removeAttr('disabled');
+           }
+       });
+
+       $("input[type='password']").val('');
+       $("#name").focus();
+       $('#accessKey').blur(KeyChangeHandler);
+       $('#secretKey').blur(KeyChangeHandler);
+
+       $('#providertype').val('AWS').trigger('change');
+       $('#myForm54').ajaxForm({
+           beforeSubmit: function(arr, $form, options) {
+               if (location.toString().indexOf('?new') === -1 && $('#providertype').val() == 'AZURE') {
+                   var azureSubscriptionId = $('#azureSubscriptionId').val();
+                   arr.push({
+                       name: 'azureSubscriptionId',
+                       value: orgValue,
+                       type: 'text',
+                       required: false
+                   })
+               }
+               // return false to cancel submit
+               if ($('#providertype').val() == 'OPENSTACK' || $('#providertype').val() == 'HPPUBLICCLOUD') {
+                   if (isFormValidOpenStack(null, 'cat-validation-openstack')) {
+                       appendLoader();
+                       return true;
+                   } else
+                       return false;
+               } else if ($('#providertype').val() == 'VMWARE') {
+                   if (isFormValidOpenStack(null, 'cat-validation-vmware')) {
+                       appendLoader();
+                       return true;
+                   } else
+                       return false;
+               } else if ($('#providertype').val() == 'AZURE') {
+                   if (isFormValidAzure(null, 'cat-validation-azure')) {
+                       appendLoader();
+                       return true;
+                   } else
+                       return false;
+               } else {
+                   if (isFormValid()) {
+                       appendLoader();
+                       return true;
+                   } else {
+                       return false;
+                   }
+               }
+           },
+           dataType: 'json',
+           success: function(data, success) {
+               if (data != 500) {
+                   
+               } else {
+                   alert(data.toString());
+               }
+               $('.btn-3 a').removeClass('not-activeAnchor');
+               removeLoader();
+           },
+           error: function(jqxhr) {
+               removeLoader();
+               console.log(jqxhr);
+               if (jqxhr.status == 409) {
+                   errormessageforInput('name', jqxhr.responseText);
+               } else {
+                   bootbox.alert(jqxhr.responseText);
+               }
+           },
+           failure: function(data) {
+               removeLoader();
+               console.log(jqxhr);
+               if (jqxhr.status == 409) {
+                   errormessageforInput('name', jqxhr.responseText);
+               } else {
+                   bootbox.alert(jqxhr.responseText);
+               }
+           }
+       });
+   });
+
+   if (!UtilityMethods.getIdFromURL()) {
+
+       var createTemplateInstance = new createTemplate($('#appender'));
+       $('#appender').append(createTemplateInstance.getFinalTemplate(true));
+       bindChange_importPemFile();
+
+       $('#myForm54').attr('action', '/aws/providers');
+       getRegionList();
+       $('select.region').change(checkForKeyPair);
+       $('#openstackinstancepem').attr('cat-validation-openstack', 'required');
+   }
+
+   function getRegionList() {
+       $.get('/vmimages/regions/list', function(data) {
+           var str = '<option value="">Select Region</option>';
+           for (var i = 0; i < data.length; i++) {
+               str = str + '<option value="' + data[i].region + '">' + data[i].region_name + ' | ' + data[i].region + '</option>'
+           }
+           UtilityMethods.initializeRegionlist();
+
+           $('select.region').each(function() {
+               if (!$(this).val()) {
+                   $(this).html(str);
+               }
+           }).each(function() {
+               $(this).attr('answer') ? $(this).val($(this).attr('answer')) : "";
+               if ($(this).attr('disabled')) {
+                   $(this).trigger('change');
+               }
+           });
+       });
+   }
+
+   function createTemplate(parentToAttach) {
+       var that = this,
+           parentEl = $(parentToAttach).addClass('customTemplateParent');
+       var getAddButton = function(classs) {
+               var title = ''
+               if (classs == 'addRegion') {
+                   titile = 'title="Add New Region" data-placement="top"';
+               } else if (classs == 'addRow') {
+                   titile = 'title="Add New Key Pair" data-placement="top"';
+               }
+               return '<img src="img/add.png" class="addimage ' + (classs ? classs : '') + '" ' + titile + ' rel="tooltip" data-placement="top" />'
+           },
+
+           getRemoveButton = function(classs) {
+               var title = ''
+               if (classs == 'removeRegion') {
+                   titile = 'title="Remove this Region" data-placement="top"';
+               } else if (classs == 'removeRow') {
+                   titile = 'title="Remove this Key Pair" data-placement="top"';
+               }
+               return '<img src="img/remove.png" class="removeimage ' + (classs ? classs : '') + '" ' + titile + ' rel="tooltip"  />'
+           },
+           getKeyValueList = function() {
+               return '<div class="col-lg-6 col-md-6 margintop20" style="width:47%;">' + '<label for="name">Select Key Pair:<span class="control-label redSpan">&nbsp;*</span></label>' + '<select id="' + UtilityMethods.getRandomNumber() + '" name="keyPairName" unique="true" uniqueconditionedby="orgname"  class="form-control chooseOrganization width-100 keyvalue secretInfo keySecretValue" ' + 'style="vertical-align:central" cat-validation="required" skiprowid="yes" cdata="catalyst">' + '  <option value="">Select Any Key Pair</option></select>' + '<input type="text" class="hidden form-control" id="keySecretValue"/>' + '</div>';
+           };
+       var getRegion = function() {
+           return '<div class="row">' + '<div class="col-lg-6 col-md-6" style="width:47%">' + '<label for="name">Region:<span class="control-label redSpan">&nbsp;*</span></label>' + '<select id="' + UtilityMethods.getRandomNumber() + '" name="region" unique="true" uniqueconditionedby="orgname"  class="form-control region regionValue chooseOrganization width-100 secretInfo keyRegionValue" style="' + 'vertical-align:central" cat-validation="required" skiprowid="yes" cdata="catalyst">' + '<option value="">Select Region</option>' + '<option value="us-west-2">us-west-2</option>' + '</select>' + '<input type="text" class="hidden form-control" id="keyRegionValue"/>' + '</div></div>';
+       };
+       var getPemFileRow = function() {
+           return '<div class="col-lg-6 col-md-6 authPemFile margintop20" style="display: block;"><div class="smart-forms" style="  margin-left: 7%;"><label for="">Upload .pem file for Provider<span class="control-label redSpan">&nbsp;*</span></label>' + '<label for="templatesicon" name="field" class="file">' + '<span class="button btn-primary btn-importbyIP" style="height:26px;line-height:22px;  padding: 1px ' + '14px;position: absolute;right:4px;margin-top: 4.5%;">Browse</span>' + '<input id="' + UtilityMethods.getRandomNumber() + '" type="file" class="gui-file file secretInfo" cdata="catalyst" cat-validation="required" name="fileObject">' + '<input type="text" readonly="" class="gui-input filename" name="fileName">' + '<input type="text" class="folderpath" style="display:none;" cdata="catalyst" />' + '</label></div></div>';
+       };
+
+       this.getRow = function(isAdd, isRemove, notrequired) {
+           var str = '';
+           if (isAdd) {
+               str = getAddButton('addRow');
+           } else if (isRemove) {
+               str = getRemoveButton('removeRow');
+           } else if (notrequired) {
+               str = '';
+           }
+           return '<div class="row pemrow">' + getKeyValueList() + getPemFileRow() + str + '</div>';
+       };
+
+       this.getFinalTemplate = function(isAddApplicable, noOfRow) {
+           noOfRow = noOfRow ? parseInt(noOfRow) : 1;
+           var str = '';
+           for (var i = 0; i < noOfRow; i++) {
+               if (i == 0) {
+                   str = str + that.getRow(false, false, false);
+               } else {
+                   str = str + that.getRow(false, false, false);
+               }
+
+           }
+           return '<div class="addNewRegion margintop20">' + (isAddApplicable ? getAddButton('addRegion') : getRemoveButton('removeRegion')) + getRegion() + str + '</div>'
+       };
+
+       $(parentEl).delegate('.addimage', 'click', function() {
+           if ($(this).hasClass('addRow')) {
+               $(this).parent().parent().append(that.getRow(false, true)).find('select');
+           } else if ($(this).hasClass('addRegion')) {
+               $(this).parents('.customTemplateParent').append(that.getFinalTemplate()).find('select');
+               getRegionList();
+           }
+           UtilityMethods.initTooltip();
+           bindChange_importPemFile();
+       });
+
+       $(parentEl).delegate('.removeimage', 'click', function() {
+           var parent = $(this).parent();
+           if ($(this).hasClass('removeRow')) {
+
+               parent.remove();
+
+           } else if ($(this).hasClass('removeRegion') && !parent.find('select.keyvalue').attr('keyID')) {
+
+               parent.remove();
+           } else {
+               bootbox.confirm('You are about to remove this KeyPair <strong>' + parent.find('select.keyvalue').val() + '</strong>', function(result) {
+                   if (result) {
+                       $.ajax({
+                           type: "delete",
+                           dataType: "text",
+                           async: false,
+                           url: "/aws/providers/keypairs/" + parent.find('select.keyvalue').attr('keyID'),
+                           success: function(data) {
+                               if (data != '401') {
+                                   parent.remove();
+                               } else {
+                                   bootbox.alert('Insufficient permission to perform this operation.');
+                               }
+                           },
+                           failure: function(data) {
+                               bootbox.alert(data.responseText);
+                           },
+                           error: function(data) {
+                               bootbox.alert(data.responseText);
+                           }
+                       });
+                   }
+               });
+           }
+           UtilityMethods.initTooltip();
+       });
+   }
+   $(".nextFormWizard").click(function() {
+       $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
+       $('.contentSetting').find('ol li#imageCreate').addClass('active');
+       $('.content').load('ajax/Settings/vmImageWizard.html');
+   });
 </script>
\ No newline at end of file
diff --git a/client/htmls/private/ajax/Settings/scriptWizard.html b/client/htmls/private/ajax/Settings/scriptWizard.html
new file mode 100644
index 000000000..2703b767e
--- /dev/null
+++ b/client/htmls/private/ajax/Settings/scriptWizard.html
@@ -0,0 +1,196 @@
+<style>
+#scriptForm input[type="file"] { 
+    display: none;
+}
+</style>
+<div class="content">
+   <form action="" id="scriptForm">
+      <div class="widget-box">
+         <div class="widget-header">
+            <h4 class="widget-margin" style="color:black;">Create Scripts</h4>
+         </div>
+         <div class="widget-body">
+            <div class="widget-main" style="height:300px">
+               <div class="jarviswidget" data-widget-editbutton="false" data-widget-custombutton="false">
+                  <div>
+                     <!-- widget content -->
+                     <div class="widget-body no-padding">
+                        <fieldset class="fieldsetCustom">
+                          <div class="col-lg-6 col-md-6 col-xs-6">
+                            <label for="scriptName">Script Name:<span class="control-label redSpan">&nbsp;*</span></label>
+                            <div class="input-groups">
+                              <input type="text" name="scriptName" class="required scriptName form-control" id="scriptName">
+                            </div>
+                          </div>
+                          <div class="col-lg-6 col-md-6 col-xs-6">
+                            <label for="">Organization Name:<span class="control-label redSpan">&nbsp;*</span></label>
+                            <div class="input-groups">
+                              <select id="orgName" name="orgName" class="required form-control width-100" style="vertical-align:central"></select>
+                            </div>
+                          </div>
+                          <div class="col-lg-6 col-md-6 col-xs-6 margintop15">
+                            <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>
+                          </div>
+                          <div class="col-lg-6 col-md-6 col-xs-6 margintop15">
+                            <label for="">Script Description:</label>
+                            <input type="text" name="scriptDescription" class="scriptDescription form-control" id="scriptDescription">
+                          </div>
+                          <div class="col-lg-12 col-md-12 col-xs-12 margintop15">
+                            <label for="scriptFile">Script File:<span class="control-label redSpan">&nbsp;*</span></label>
+                            <div class="input-groups">
+                              <input type="file" name="scriptFile" id="scriptFile" class="required form-control form-controls" onchange="setfilename(this.value);"/>
+                            </div>
+                              <span class="pull-left">
+                                  <label title="Please choose a script file" class="choose-file cursor" for="scriptFile">Choose File</label>
+                              </span>
+                              <div id="fileNameDisplay" class="file-name"></div>
+                          </div>
+                          <input type="hidden" id="scriptHiddenInputId">
+                          <input type="hidden" id="fileHiddenInputId">
+                          <input type="hidden" id="scriptFileNameHidden">
+                        </fieldset>
+                     </div>
+                     <!-- end widget content -->
+                  </div>
+               </div>
+            </div>
+         </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>
+             <input type="button" name="next1" id="next1" class="nextFormWizard btn btn-primary" value="Next"/>
+          </div>
+       </div>
+      </div>
+   </form>
+</div>
+<script>
+
+    orgNameForSetup = $('#orgDropdown option:selected').attr('rowid');
+    orgIdForSetup = $('#orgDropdown option:selected').val();
+    var $optionOrg = $('<option></option>').val(orgIdForSetup).attr('rowid',orgIdForSetup).html(orgNameForSetup);
+    $('#orgName').append($optionOrg);
+    
+    function setfilename(val){
+      $('#fileNameDisplay').empty();
+      var fileName = val.substr(val.lastIndexOf("\\")+1, val.length);
+      $("#fileNameDisplay").append(fileName);
+    }
+
+    //form validation for dashboard save
+    var validator = $('#scriptForm').validate({
+        ignore: [],
+        rules: {
+            scriptFile: {
+                extension: "sh"
+            },
+            scriptName: {
+                maxlength: 15
+            }
+        },
+        messages: {
+            scriptFile: {
+                extension: "Only .sh files can be uploaded"
+            },
+            scriptName: {
+                maxlength: "Limited to 15 chars"
+            }
+        },
+        onkeyup: false,
+        errorClass: "error",
+        errorPlacement: function(error, element) {
+            var elem = $(element);
+            if (element.parent('.input-groups').length) {
+                error.insertBefore(element.parent());
+            } else {
+                if (element.parent('div.inputGroups')) {
+                    error.insertBefore('div.inputGroups');
+                }
+            }
+        },
+    });
+
+    function formSave(methodName,url,reqBody) {
+    $.ajax({
+        method: methodName,
+        url: url,
+        data: reqBody,
+        success: function(data, success) {
+        },
+        error: function(jxhr) {
+            removeUploadFile(data.fileId);
+            var msg = "Server Behaved Unexpectedly";
+            if (jxhr.responseJSON && jxhr.responseJSON.message) {
+                msg = jxhr.responseJSON.message;
+            } else if (jxhr.responseText) {
+                msg = jxhr.responseText;
+            }
+            toastr.error(msg);   
+        }
+    });
+    return false;
+}
+
+
+//save form for creating a new script item and updation of the script item(name, description etc)..
+$('#scriptForm').submit(function(e) {
+    var $form = $('#scriptForm');
+    var scriptData = {};
+    var $this = $(this);
+    var name = $this.find('#scriptName').val().trim();
+    var description = $this.find('#scriptDescription').val().trim();
+    var type = $form.find('#scriptType').val();
+    var orgId = $form.find('#orgName').val();
+    var scriptId = $form.find('#scriptHiddenInputId').val();
+    var fileId = $form.find('#fileHiddenInputId').val();
+    var orgName = $form.find('#orgName :selected').text();
+    var fileNameDisplay = $form.find('#scriptFile').val();
+    var availableFileName = $form.find('#fileNameDisplay').text();
+    var hiddenFileName = $form.find('#scriptFileNameHidden').text();
+    var orgDetails = {
+        name: orgName,
+        id: orgId
+    }
+    var url = '';
+    var reqBody = {};
+    var formData = new FormData();
+    formData.append('file', $('input[type=file]')[0].files[0]);
+    var methodName ='';
+        $.ajax({
+        method: "POST",
+        url: '../fileUpload?fileId='+fileId,
+        data: formData,
+        cache: false,
+        contentType: false,
+        processData: false,
+            success: function(data, success) {
+                
+                    url = '../scripts/save/scriptData';
+                    methodName = 'POST';
+                    reqBody = {
+                        "name": name,
+                        "type": type,
+                        "description": description,
+                        "orgDetails": orgDetails,
+                        "fileId": data.fileId
+                    };
+                formSave(methodName,url,reqBody);      
+                toastr.success('Succesfully created Script. Proceed to the next Step');
+            }
+        });
+    return false;
+});
+    
+    $(".nextFormWizard").click(function(){
+        toastr.success('Step 4 - Gallery Setup Completed');
+        $('#startConfig a, #orgConfiguration a,#configManagement a,#providerConfiguration a,#galleryConfiguration a').addClass('green-btn').removeClass('process-btn');
+        $('.wizardFlow').empty();
+        $('#devopsConfiguration a').trigger('click');
+    });
+</script>
\ No newline at end of file
diff --git a/client/htmls/private/ajax/Settings/serviceCommandWizard.html b/client/htmls/private/ajax/Settings/serviceCommandWizard.html
new file mode 100644
index 000000000..80e192ff5
--- /dev/null
+++ b/client/htmls/private/ajax/Settings/serviceCommandWizard.html
@@ -0,0 +1,246 @@
+<div class="content">
+   <form action="" id="myForm50">
+      <div class="widget-box">
+         <div class="widget-header">
+            <h4 class="widget-margin" style="color:black;">Create Services</h4>
+         </div>
+         <div class="widget-body">
+            <div class="widget-main" style="min-height:300px">
+               <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="">Organization:<span class="control-label redSpan">&nbsp;*</span></label>
+                           <select id="orgname" class="form-control chooseOrganization width-100" sourcepath="1" datapath="masterjson.rows.row" cdata="catalyst" cat-validation="required">
+                              <option value="">Select Organization</option>
+                           </select>
+                        </div>
+                        <div class="col-lg-6 col-md-6">
+                           <label for="name">Name:
+                           <span class="control-label redSpan">&nbsp;*</span></label>
+                           <input type="text" id="servicename" class="form-control" cdata="catalyst" unique="true" uniqueconditionedby="servicename" cat-validation="required,max15,nospecial,nospace">
+                        </div>
+                        <div class="col-lg-5 CommandName hidden" style="padding-top:10px;">
+                           <label for="">Command Name</label>
+                           <input type="text" id="commandname" cdata="catalyst">
+                        </div>
+                        <div class="col-lg-6 col-md-6 margintop15">
+                           <label for="name">
+                           Service Command Type
+                           </label>
+                           <select class="form-control width-100" id="commandtype" cdata="catalyst">
+                              <option value="Chef Cookbook/Recipe">Chef Cookbook/Recipe</option>
+                              <option value="Service Command">Service Command</option>
+                           </select>
+                        </div>
+                        <div class="col-lg-6 col-md-6 chooseChefServer margintop15">
+                           <label class="">
+                           Select Chefserver<span class="control-label redSpan">&nbsp;*</span>
+                           </label>
+                           <select class="form-control chooseChefServerdropdown width-100" cdata="catalyst" id="configname" sourcepath="10" onchange="loadcookbooksinto('servicecookbook','configname');" datapath="masterjson.rows.row">
+                           </select>
+                           <input type="text" id="chefserverid" cdata="catalyst" style="display:none" />
+                        </div>
+                        <div class="col-lg-6 col-md-6 ServiceCookbooks margintop15">
+                           <label class="">
+                           Service Cookbooks <span class="control-label redSpan">&nbsp;*</span> <img class="servicecookbookspinner hidden" style="margin-left:5px" src="img/select2-spinner.gif">
+                           </label>
+                           <select class="form-control chooseServiceCookbooks width-100" id="servicecookbook" cdata="catalyst" onchange="$('#servicecookbookspinner').removeClass('hidden');loadreceipesinto(['servicestart','servicestop','servicerestart','servicekill','servicestatus'],$(this).val(),'configname','loadactioncheckboxes');">
+                           </select>
+                        </div>
+                        <!--choose operating system-->
+                        <div class="col-lg-6 col-md-6 CommandName margintop15">
+                           <label class="">Choose Operating System</label>
+                           <div class="inline-group">
+                              <select class="form-control chooseActiontype width-100" id="operatingsystem" cdata="catalyst">
+                                 <option value="linux">Linux</option>
+                                 <option value="windows">Windows</option>
+                              </select>
+                           </div>
+                        </div>
+                        <!--choose operating system ends here-->
+                        <div class="col-lg-6 col-md-6 CommandName margintop15">
+                           <label>Command</label>
+                           <input type="text" id="command" class="form-control" cdata="catalyst">
+                        </div>
+                        <div class="col-lg-12 col-md-12 smart-form" id="chefCookbook-dropdown">
+                           <label style="padding-left:15px;margin-top:20px;">Select Actions <img class="receipelistspinner hidden" style="margin-left:5px" src="img/select2-spinner.gif"></label>
+                           <div style="margin-left: 15px;" class="row">
+                              <div class="col-lg-6 col-md-6 col-sm-6">
+                                 <div class="col-sm-2">
+                                    <label class="checkbox actionTypeContainer">
+                                    <input type="checkbox" value="start" name="checkbox" id="servicestartcheckbox">
+                                    <i></i>Start
+                                    </label>
+                                 </div>
+                                 <div class="col-sm-4">
+                                    <select class="form-control chooseservicesCookBookRecipeList width-100" id="servicestart" cdata="catalyst">
+                                    </select>
+                                 </div>
+                              </div>
+                              <div class="col-lg-6 col-md-6 col-sm-6">
+                                 <div class="col-sm-2">
+                                    <label class="checkbox actionTypeContainer">
+                                    <input type="checkbox" value="start" name="checkbox" id="servicestopcheckbox">
+                                    <i></i>Stop
+                                    </label>
+                                 </div>
+                                 <div class="col-sm-4">
+                                    <select class="form-control chooseservicesCookBookRecipeList width-100" id="servicestop" cdata="catalyst">
+                                    </select>
+                                 </div>
+                              </div>
+                           </div>
+                           <br>
+                           <div style="margin-left:15px;" class="row">
+                              <div class="col-lg-6 col-md-6 col-sm-6">
+                                 <div class="col-sm-2">
+                                    <label class="checkbox actionTypeContainer">
+                                    <input type="checkbox" value="start" name="checkbox" id="servicerestartcheckbox">
+                                    <i></i>Restart
+                                    </label>
+                                 </div>
+                                 <div class="col-sm-4">
+                                    <select class="form-control chooseservicesCookBookRecipeList width-100" id="servicerestart" cdata="catalyst">
+                                    </select>
+                                 </div>
+                              </div>
+                              <div class="col-lg-6 col-md-6 col-sm-6">
+                                 <div class="col-sm-2">
+                                    <label class="checkbox actionTypeContainer">
+                                    <input type="checkbox" value="start" name="checkbox" id="servicestatuscheckbox">
+                                    <i></i>Status
+                                    </label>
+                                 </div>
+                                 <div class="col-sm-4">
+                                    <select class="form-control chooseservicesCookBookRecipeList width-100" id="servicestatus" cdata="catalyst">
+                                    </select>
+                                 </div>
+                              </div>
+                           </div>
+                        </div>
+                        <div class="col-lg-12 smart-form" id="customScript-dropdown">
+                           <div class="col-lg-12" style="padding-top:14px;margin-left:15px;">
+                              <label class="">Select Action</label>
+                              <div class="row" cdata="catalyst" ctype="checkbox" id="commandaction">
+                                 <div class="col-lg-2 col-sm-2">
+                                    <label class="checkbox">
+                                    <input type="checkbox" name="checkbox" id="checkbox_start" value="start">
+                                    <i></i>Start</label>
+                                 </div>
+                                 <div class="col-sm-2">
+                                    <label class="checkbox">
+                                    <input type="checkbox" name="checkbox" id="checkbox_stop" value="stop">
+                                    <i></i>Stop</label>
+                                 </div>
+                                 <div class="col-sm-2">
+                                    <label class="checkbox">
+                                    <input type="checkbox" name="checkbox" id="checkbox_restart" value="restart">
+                                    <i></i>Restart</label>
+                                 </div>
+                                 <div class="col-sm-2">
+                                    <label class="checkbox">
+                                    <input type="checkbox" name="checkbox" id="checkbox_status" value="status">
+                                    <i></i>Status</label>
+                                 </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="saveProviderWizard" 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>
+      </div>
+   </form>
+</div>
+<script>
+    orgNameForSetup = $('#orgDropdown option:selected').attr('rowid');
+    orgIdForSetup = $('#orgDropdown option:selected').val();
+    var $optionOrg = $('<option></option>').val(orgNameForSetup).attr('rowid',orgIdForSetup).html(orgNameForSetup);
+    $('#orgname').append($optionOrg);
+    $('#commandtype').change(function(e) {
+        if (this.value == "Chef Cookbook/Recipe") {
+            $(".CommandName").hide();
+            $("#customScript-dropdown").hide();
+            $("#chefCookbook-dropdown").show();
+            $(".ServiceCookbooks").show();
+            $(".chooseChefServer").show();
+        } else {
+            $("#customScript-dropdown").show();
+            $("#chefCookbook-dropdown").hide();
+            $(".ServiceCookbooks").hide();
+
+            $(".CommandName").show();
+            $(".chooseChefServer").hide();
+        }
+    });
+    $("#commandtype").trigger('change');
+    //preprocess() -> will set the dropdown values to "none" if checkbox is not selected.
+    function preprocess() {
+        $('#commandname').val($('#servicename').val());
+        //Clearing off all options based on selection
+        if ($('#commandtype').val() === "Service Command") {
+            //clear all chef checkboxes
+            $('input[id*="service"][type="checkbox"]').removeAttr('checked');
+
+        } else {
+            //clear all service checkboxes
+            $('#commandaction').find('input[type="checkbox"]').removeAttr('checked');
+        }
+        //Removing kill for all options
+        $('#checkbox_kill').removeAttr('checked');
+        $('#servicekillcheckbox').removeAttr('checked');
+        $('select.chooseservicesCookBookRecipeList').each(function() {
+            var cb = $('#' + $(this).attr('id') + 'checkbox');
+            //console.log(cb.val());
+            var $sel = $(this);
+            if (!cb.is(":checked")) {
+                $sel.append('<option value="none"></option>');
+                $sel.val('none');
+            }
+
+        });
+    }
+
+    $("#orgname").on("change", function(e) {
+        $.get('/d4dMasters/readmasterjsonnew/10',function(data){
+            if(orgIdForSetup === data[0].orgname_rowid[0]){
+                var $optionChefServer = $('<option></option>').val(data[0].configname).attr('rowid',data[0].rowid).html(data[0].configname);
+                $('#configname').append($optionChefServer);
+            }
+            $("#configname").trigger('change');
+        });
+    });
+
+    function validateForm() {
+        //Check for required parameter
+        return (true);
+    }
+    $('#myForm50').submit(function() {
+        $(this).validate();
+        if ($(this).valid) {
+            if (validateForm()) {
+                preprocess();
+                if (!saveform('19'))
+                    return false;
+            };
+        } else {
+            alert('invalid valid form submitted'); // for demo
+        }
+        return false; // for demo
+    });
+    $(".nextFormWizard").click(function(){
+        $('.contentSetting').find('ol li#serviceCreate').removeClass('active').addClass('green-btn');
+        $('.contentSetting').find('ol li#scriptCreate').addClass('active');
+        $('.content').load("ajax/Settings/scriptWizard.html");
+    });
+</script>
\ No newline at end of file
diff --git a/client/htmls/private/ajax/Settings/settingsWizard.html b/client/htmls/private/ajax/Settings/settingsWizard.html
index a839550e5..51703ecef 100644
--- a/client/htmls/private/ajax/Settings/settingsWizard.html
+++ b/client/htmls/private/ajax/Settings/settingsWizard.html
@@ -1,249 +1,194 @@
-<style>
-    /*custom font*/
-    @import url(http://fonts.googleapis.com/css?family=Montserrat);
-
-    /*form styles*/
-    form {
-        margin: 10px auto;
-        position: relative;
-    }
-
-    /*Hide all except first fieldset*/
-    form:not(:first-of-type) {
-        display: none;
-    }
-
-    /*buttons*/
-    form .action-button {
-        width: 100px;
-        background: #27AE60;
-        font-weight: bold;
-        color: white;
-        border: 0 none;
-        border-radius: 1px;
-        cursor: pointer;
-        padding: 10px 5px;
-        margin: 10px 5px;
-    }
-    form .action-button:hover, #msform .action-button:focus {
-        box-shadow: 0 0 0 2px white, 0 0 0 3px #27AE60;
-    }
-    /*headings*/
-    .fs-title {
-        font-size: 15px;
-        text-transform: uppercase;
-        color: #2C3E50;
-        margin-bottom: 10px;
-    }
-    .fs-subtitle {
-        font-weight: normal;
-        font-size: 13px;
-        color: #666;
-        margin-bottom: 20px;
-    }
-    /*progressbar*/
-    #progressbar {
-        overflow: hidden;
-        text-align: center;
-        /*CSS counters to number the steps*/
-        counter-reset: step;
-        margin-top: 5px;
-    }
-    #progressbar li {
-        list-style-type: none;
-        font-size: 15px;
-        width: 33.33%;
-        float: left;
-        position: relative;
-    }
-    #progressbar li:before {
-        content: counter(step);
-        counter-increment: step;
-        width: 20px;
-        line-height: 20px;
-        display: block;
-        font-size: 10px;
-        color: #fff;
-        background: #7d7676;
-        border-radius: 3px;
-        margin: 0 auto 5px auto;
-    }
-    /*progressbar connectors*/
-    #progressbar li:after {
-        content: '';
-        width: 100%;
-        height: 2px;
-        background: #7d7676;
-        position: absolute;
-        left: -50%;
-        top: 9px;
-        z-index: -1; /*put it behind the numbers*/
-    }
-    #progressbar li:first-child:after {
-        /*connector not needed before the first step*/
-        content: none;
-    }
-    /*marking active/completed steps green*/
-    /*The number of the step and the connector before it = green*/
-    #progressbar li.active:before,  #progressbar li.active:after{
-        background: #27AE60;
-        color: white;
-    }
-
-    .content {
-        margin:0 auto;
-        padding: 10px;
-    }
-    a, a:hover {
-        color:#7d7676;
-        text-decoration: none;
-    }
-</style>
-<!-- multistep form -->
-
 <!-- progressbar -->
-<ul id="progressbar">
-    <li class="orgCreate" id="orgCreate">Create Organisation</a></li>
-    <li class="bgCreate" id="bgCreate">Create BG</a></li>
-    <li class="projectCreate" id="projectCreate">Create Project</a></li>
-</ul>
-<!-- fieldsets -->
+<div class="wizardFlow">
+</div>
 <div class="content">
-    <form action="" id="myForm">
-        <div class="widget-box">
-            <div class="widget-header">
-                <h4 class="widget-margin" style="color:black;">Create Organization</h4>
-            </div>
-            <div class="widget-body">
-                <div class="widget-main" style="min-height:200px">
-                    <div class="jarviswidget" id="wid-id-3" data-widget-editbutton="false" data-widget-custombutton="false">
-                        <div>
-                            <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>
-                                    <input autofocus name="orgname" value="" id="orgname" class="form-control" cdata="catalyst" type="text" cat-validation="required,nospecial,max15,nospace">
-                                </div>
-                                <div class="col-lg-6 col-md-6">
-                                    <label for="name">Domain Name:</label>
-                                    <input name="domainname" value="" id="domainname" class="form-control" type="text" maxlength="35">
-                                </div>
-                                <div class="col-lg-6 col-md-6 margintop15">
-                                    <label for="name">Planned Cost:</label>
-                          <span>
-                            <img data-toggle="popover" data-html="true" data-placement="left" title="Provider Planned Cost for a Month." src="img/help.png"/>
-                          </span>
-                                    <input name="plannedCost" value="" id="plannedCost" cat-validation="numeric" class="form-control" type="text"  cdata="catalyst" maxlength="35">
-                                </div>
-                            </div>
+   <form action="" id="myForm">
+      <div class="widget-box">
+         <div class="widget-header">
+            <h4 class="widget-margin" style="color:black;">Create Organization</h4>
+         </div>
+         <div class="widget-body">
+            <div class="widget-main" style="min-height:200px">
+               <div class="jarviswidget" id="wid-id-3" data-widget-editbutton="false" data-widget-custombutton="false">
+                  <div>
+                     <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>
+                           <input autofocus name="ctl00$MainContent$orgname" value="" id="orgname" class="form-control" cdata="catalyst" type="text" cat-validation="required,nospecial,max15,nospace">
                         </div>
-                    </div>
-                </div>
+                        <div class="col-lg-6 col-md-6">
+                           <label for="name">Domain Name:</label>
+                           <input name="ctl00$MainContent$domainname" value="" id="domainname" class="form-control" type="text" maxlength="35">
+                        </div>
+                        <div class="col-lg-6 col-md-6 margintop15">
+                           <label for="name">Planned Cost:</label>
+                           <span>
+                           <img data-toggle="popover" data-html="true" data-placement="left" title="Provider Planned Cost for a Month." src="img/help.png"/>
+                           </span>
+                           <input name="plannedCost" value="" id="plannedCost" cat-validation="numeric" class="form-control" type="text"  cdata="catalyst" maxlength="35">
+                        </div>
+                     </div>
+                  </div>
+               </div>
+            </div>
+         </div>
+         <div class="widget-toolbox clearfix">
+            <div class="btn-group pull-right">
+               <button name="next1" id="saveOrg" 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 class="btn-group pull-right">
-            <button  name="next1" id="next1" class="next action-button" value="Next">Next</button>
-        </div>
-    </form>
+         </div>
+      </div>
+   </form>
 </div>
 
 <script>
-    //jQuery time
-    function checkNestedSteps(orgStatus,bgStatus,projectStatus){
-        if(orgStatus === true && bgStatus === false){
-            $('li.bgCreate').addClass('active');
-        }else if(orgStatus === true && bgStatus === true && projectStatus === false){
-            $('li.projectCreate').addClass('active');
-        }else{
-            $('li.orgCreate').addClass('active');
-        }
-    }
-    var current_fs, next_fs, previous_fs; //fieldsets
-    var left, opacity, scale; //fieldset properties which we will animate
-    var animating; //flag to prevent quick multi-click glitches
+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>');
+$('.wizardFlow').append(wizardSteps);
 
-    var orgId;
-    $('#myForm').submit(function(e){
-        $(this).validate();
-        if ($(this).valid) {
-            if (!saveform('1')){
-                $('.content').load('ajax/Settings/bgWizard.html');
-                return false;
+function getOrgValues() {
+    $.get('/d4dMasters/readmasterjsonnew/1', function(data) {
+        for (var i = 0; i < data.length; i++) {
+            if (selectedDropdownValue === data[i].rowid || lastDropdownValue === data[i].rowid) {
+                $('#myForm').find('input#orgname').val(data[i].orgname).attr('disabled', 'disabled');
+                $('#myForm').find('input#domainname').val(data[i].domainname).attr('disabled', 'disabled');
+                $('#myForm').find('input#plannedCost').val(data[i].plannedCost).attr('disabled', 'disabled');
             }
-
-        } else {
-            alert('invalid valid form submitted'); // for demo
         }
-        e.preventDefault();
-        return false; // for demo
+        $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
+       // $('#saveOrg').attr('disabled', true);
     });
+}
 
-    $(".next").click(function(){
-        if(animating) return false;
-        animating = true;
-
-        current_fs = $(this).parent();
-        next_fs = $(this).parent().next();
+function getBgValues() {
+    $('#myForm2').find('select#orgname').empty();
+    $('#saveBg').attr('disabled', true);
+    $.get('/d4dMasters/readmasterjsonnew/2', function(data) {
+        for (var i = 0; i < data.length; i++) {
+            if (selectedDropdownValue === data[i].orgname_rowid[0]) {
+                $('#myForm2').find('input#productgroupname').val(data[i].productgroupname).attr('disabled', 'disabled');
+                var $optionBg = $('<option></option>').val(data[i].orgname[0]).attr('rowid', data[i].orgname_rowid[0]).html(data[i].orgname[0]);
+                $('#myForm2').find('select#orgname').append($optionBg).attr('disabled', 'disabled');
+            }
+        }
+    });
+}
 
-        //activate next step on progressbar using the index of next_fs
-        $("#progressbar li").eq($("div form").index(next_fs)).addClass("active");
-        //show the next fieldset
-        next_fs.show();
-        //hide the current fieldset with style
-        current_fs.animate({opacity: 0}, {
-            step: function(now, mx) {
-                //as the opacity of current_fs reduces to 0 - stored in "now"
-                //1. scale current_fs down to 80%
-                scale = 1 - (1 - now) * 0.2;
-                //2. bring next_fs from the right(50%)
-                left = (now * 50)+"%";
-                //3. increase opacity of next_fs to 1 as it moves in
-                opacity = 1 - now;
-                current_fs.css({'transform': 'scale('+scale+')'});
-                next_fs.css({'left': left, 'opacity': opacity});
-            },
-            duration: 800,
-            complete: function(){
-                current_fs.hide();
-                animating = false;
-            },
-            //this comes from the custom easing plugin
-            easing: 'easeInOutBack'
+function getProjValues() {
+    $('#saveProject').attr('disabled', true);
+    $('#myForm3').find('select#orgname').empty();
+    $('#myForm3').find('select#productgroupname').empty();
+    $.get('/d4dMasters/readmasterjsonnew/4', function(data) {
+        for (var i = 0; i < data.length; i++) {
+            if (selectedDropdownValue === data[i].orgname_rowid[0]) {
+                $('#myForm3').find('input#projectname').val(data[i].projectname).attr('disabled', 'disabled');
+                $('#myForm3').find('input#description').val(data[i].description).attr('disabled', 'disabled');
+                var $optionBgProj = $('<option></option>').val(data[i].orgname[0]).attr('rowid', data[i].orgname_rowid[0]).html(data[i].orgname[0]);
+                $('#myForm3').find('select#orgname').append($optionBgProj).attr('disabled', 'disabled');
+            }
+        }
+        $('#myForm3').find('select#orgname').change(function(e) {
+            $.get('/d4dMasters/readmasterjsonnew/2', function(data) {
+                for (var i = 0; i < data.length; i++) {
+                    if (selectedDropdownValue === data[i].orgname_rowid[0]) {
+                        var $option = $('<option></option>').val(data[i].productgroupname).attr('rowid', data[i].rowid).html(data[i].productgroupname);
+                        $('#myForm3').find('select#productgroupname').append($option).attr('disabled', 'disabled');
+                    }
+                }
+            });
         });
+        $('#myForm3').find('select#orgname').trigger('change').attr('disabled', 'disabled');
     });
+}
 
-    $(".previous").click(function(){
-        if(animating) return false;
-        animating = true;
+$('.btn-2 a').click(function(e) {
+    e.preventDefault();
+    clicked = false;
+    getOrgValues();
+    //$('#saveOrg').removeAttr('disabled', 'disabled');
+    $('.contentSetting').load(this.getAttribute('href'));
+});
+orgIdForSetup = selectedDropdownValue;
+if (clicked) {
+    if (orgIdForSetup) {
+        $.get('/setting-wizard/org/' + orgIdForSetup, function(data) {
+            if (data.currentStep.name === 'Org Configuration') {
+                if (data.currentStep.nestedSteps) {
+                    var nestedSteps = data.currentStep.nestedSteps;
+                    if (nestedSteps[0].name === 'Organization' && nestedSteps[0].isCompleted === true && nestedSteps[1].name === 'BusinessGroup' && nestedSteps[1].isCompleted === false && nestedSteps[2].name === 'Project' && nestedSteps[2].isCompleted === false) {
+                       $('.btn-3 a').removeClass('not-activeAnchor');
+                        activateOrg();
+                    } else if(nestedSteps[0].name === 'Organization' && nestedSteps[0].isCompleted === true && nestedSteps[1].name === 'BusinessGroup' && nestedSteps[1].isCompleted === true && nestedSteps[2].name === 'Project' && nestedSteps[2].isCompleted === false){
+                        $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
+                        $('.contentSetting wizardFlow').find('ol li#bgCreate').removeClass('active').addClass('green-btn');
+                        $('.contentSetting wizardFlow').find('ol li#projectCreate').addClass('active');
+                        $('.content').load('ajax/Settings/projWizard.html');
+                    } else {
 
-        current_fs = $(this).parent();
-        previous_fs = $(this).parent().prev();
+                    }
+                }
+            } else {
+              $('.btn-3 a').removeClass('not-activeAnchor');
+              $('.btn-4 a').removeClass('not-activeAnchor');
+              $('.nextFormWizard').removeAttr('disabled');
+                $('.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');
+                $('.btn-3 a').parent('.bwizard-steps li').addClass('green-btn');
+                $('.btn-4 a').parent('.bwizard-steps li').addClass('green-btn');
+            }
+        });
+    }
+} else {
+  $('.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');
+  getOrgValues();
+}
+$('.btn-3 a').click(function(e) {
+    e.preventDefault();
+    if (selectedDropdownValue || lastDropdownValue) {
+        $('.nextFormWizard').removeAttr('disabled');
+        getBgValues();
+    } else {
+        $('.btn-2 a,.btn-4 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').load(this.getAttribute('href'));
+    if (selectedDropdownValue || lastDropdownValue) {
+      $('.nextFormWizard').removeAttr('disabled');
+        getProjValues();
+    } else {
+        $('.btn-2 a,.btn-3 a').parent('.bwizard-steps li').removeClass('active');
+        $(this).parent('.bwizard-steps li').addClass('active');
+    }
+});
 
-        //de-activate current step on progressbar
-        $("#progressbar li").eq($("div form").index(current_fs)).removeClass("active");
+function activateOrg() {
+    $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn');
+    $('.contentSetting').find('ol li#bgCreate').addClass('active');
+    $('.content').load('ajax/Settings/bgWizard.html');
+}
 
-        //show the previous fieldset
-        previous_fs.show();
-        //hide the current fieldset with style
-        current_fs.animate({opacity: 0}, {
-            step: function(now, mx) {
-                //as the opacity of current_fs reduces to 0 - stored in "now"
-                //1. scale previous_fs from 80% to 100%
-                scale = 0.8 + (1 - now) * 0.2;
-                //2. take current_fs to the right(50%) - from 0%
-                left = ((1-now) * 50)+"%";
-                //3. increase opacity of previous_fs to 1 as it moves in
-                opacity = 1 - now;
-                current_fs.css({'left': left});
-                previous_fs.css({'transform': 'scale('+scale+')', 'opacity': opacity});
-            },
-            duration: 800,
-            complete: function(){
-                current_fs.hide();
-                animating = false;
-            },
-            //this comes from the custom easing plugin
-            easing: 'easeInOutBack'
-        });
-    });
+$('#myForm').submit(function(e) {
+    $(this).validate();
+    if ($(this).valid) {
+        if (!saveform('1')) {
+          $('.btn-3 a').removeClass('not-activeAnchor');
+            return false;
+        }
+    } else {
+        toastr.error('invalid valid form submitted');
+    }
+    return false;
+});
+$('.nextFormWizard').click(function(e) {
+    activateOrg();
+});
 </script>
\ No newline at end of file
diff --git a/client/htmls/private/ajax/Settings/teamWizard.html b/client/htmls/private/ajax/Settings/teamWizard.html
new file mode 100644
index 000000000..addb82cf8
--- /dev/null
+++ b/client/htmls/private/ajax/Settings/teamWizard.html
@@ -0,0 +1,112 @@
+
+    <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="saveConfigEnv" 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>
+
+<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/templatesWizard.html b/client/htmls/private/ajax/Settings/templatesWizard.html
deleted file mode 100644
index 1b58c3559..000000000
--- a/client/htmls/private/ajax/Settings/templatesWizard.html
+++ /dev/null
@@ -1,529 +0,0 @@
-<form action="" id="myForm6">
-   <div class="widget-box">
-      <div class="widget-header">
-         <h4 class="widget-margin" style="color:black;">Create Templates</h4>
-      </div>
-      <div class="widget-body">
-         <div class="widget-main" style="min-height:200px">
-            <div class="jarviswidget" data-widget-editbutton="false" data-widget-custombutton="false">
-               <div>
-                                 <!-- widget content -->
-                                 <div class="widget-body no-padding">
-                                    <div class="row zero-margin" >
-                                       <div class="col-lg-6 col-md-6">
-                                          <label for="">Template Name:<span class="control-label redSpan">&nbsp;*</span></label>
-                                          <label id="msgOrgName"></label>
-                                          <input name="ctl00$MainContent$orgname" value="" id="templatename" class="form-control"  cdata="catalyst" unique="true" uniqueconditionedby="templatename,templatetypename" type="text" cat-validation="required,max15">
-                                       </div>
-                                       <div class="col-lg-6 col-md-6">
-                                          <div class="smart-forms">
-                                             <label for="">Icon:</label>
-                                             <label for="templatesicon" name="field" class="file">
-                                                <div class="imgdiv" value="1"></div>
-                                                <span class="button btn-primary">Browse</span><input id="templatesicon" type="file" onchange="this.nextSibling.value = this.value" cdata="catalyst" class="gui-file"><input type="text" readonly="" class="gui-input">
-                                             </label>
-                                          </div>
-                                       </div>
-                                    </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>
-                                       </div>
-                                       <div class="col-lg-6 col-md-6" hidden>
-                                          Template Provider Path:
-                                          <label id="msgOrgName" style="display:none;color:red;float:right;">Required</label>
-                                          <input name="ctl00$MainContent$orgname" value="https://" id="providertemplatepath" class="form-control" type="text">
-                                       </div>
-                                       
-                                    
-                                       <div class="col-lg-6 col-md-6 margintop20">
-
-                                                        <label for="category">Organization:<span class="control-label redSpan">&nbsp;*</span>
-                                                        </label>
-
-                                                        <select id="orgname" class="chooseOrganization width-100 form-control" sourcepath="1" datapath="masterjson.rows.row" valuelinkfield="costcode" style="vertical-align:central" cdata="catalyst" cat-validation="required" cat-validation="required" linkedfields="['configname']" onchange="loadCookbookSelectorControlFromOrgId('orgname')">
-                                                            <option value="">Select an Organization</option>
-                                                        </select>
-
-                                                    </div>
-
-                                       <div  class="col-lg-6 col-md-6 forDocker" style="margin-top:16px;">
-                                          
-                                             <label for="">
-
-                                             Select Docker Repo 
-                                             </label>
-                                             
-                                             <select id="dockerreponame" class="choosedockerRepo width-100" sourcepath="18" datapath="masterjson.rows.row"  cdata="catalyst">
-                                                <option value="">Select an Docker Path</option>
-                                             </select>
-                                          
-                                          
-                                       </div>
-
-                                       <div class="col-lg-6 col-md-6 notforDocker forCFT" style="margin-top:20px">
-                                                <div class="smart-forms">
-                                                   <label>Template File:<span class="control-label redSpan">&nbsp;*</span></label>
-                                                   <label for="validatorpemfile" class="field file">
-                                                      <div class="imgdiv" value="1"></div>
-                                                      <span class="button btn-primary">Browse</span><input id="template" keyfield="configname" type="file" onchange="this.nextSibling.value = this.value" cdata="catalyst" class="gui-file"><input type="text" readonly="" class="gui-input">
-                                                   </label>
-                                                </div>
-                                       </div>
-                                       
-                                    
-                                       
-                                          <div class="col-lg-6 col-md-6 forDocker hidden" style="margin-top:16px">
-                                             
-                                                <label for="">
-                                                Title
-                                                <label id="msgOrgName2" style="display:none;color:red;float:right;">Required</label></label>
-                                             
-                                             
-                                                
-                                                   <input name="ctl00$MainContent$costcode" value="" id="dockercontainerstitle" class="form-control" type="text" datavalues="dockercontainerstitle" targetelement="dockercontainerpathstitle"  show="imgCheck" maxlength="13">
-                                                
-                                             
-                                             
-                                          </div>
-                                          <div class="col-lg-6 col-md-6 forDocker" style="margin-top:16px;">
-                                             <label for="">
-                                             Add  Docker Repo Path <span class="control-label redSpan">&nbsp;*</span>
-                                             <label id="msgOrgName2" style="display:none;color:red;float:right;">Required</label>
-                                             </label>
-                                             <input name="ctl00$MainContent$costcode" value="" id="dockercontainers" class="form-control" type="text" datavalues="dockercontainerpaths" targetelement="dockercontainerpaths"  relatedlist="dockercontainerpathstitle" show="imgDed">
-                                                <div class="input-group hidden">
-                                                   
-                                                   <span class="input-group-addon" style="padding:1px !important;">
-                                                   <input type="button" class="btn btn-sm btn-primary" title="Check to add to list" style="width:53px;height:34px;" value="Add" onclick="addToTargetList($('#dockercontainers'),$('#dockercontainerstitle'));" />
-                                                   </span>
-                                                </div>
-                                             
-                                          </div>
-                                       
-                                    
-                                 
-                                 
-                                 <div class="col-lg-12 col-md-12 notforDocker notCFT" style="margin-top:25px">
-                                 <div class="row notforDocker" style="margin-top:15px">
-                                 <div class="" id="templatescookbooks" cdata='catalyst'>
-                                 </div> 
-                                 </div>
-                                 </div>
-
-                                 <div class="col-lg-12 col-md-12 forDocker">
-                                 <div class="col-lg-6 col-md-6 forDocker  noleftpadding" style="margin-top:15px">
-                                 <div id="dockercontainerpathstitle" class="input-group from-control col-md-12 forDocker" style="height:20px;overflow-y:auto;min-width:105px;"  cdata="catalyst" ctype="list" csource="dockercontainerstitle" ></div>
-                                 </div>
-                                 <div class="col-lg-6 col-md-6 forDocker" style="margin-top:15px"> 
-                                 <div id="dockercontainerpaths" class="input-group from-control col-md-12 forDocker" style="height:20px;overflow-y:auto;"  cdata="catalyst" ctype="list" csource="dockercontainers"></div>
-                                 </div>
-                                 </div>
-                                 
-                              </div>
-                              <!-- end widget content -->
-                           </div>
-            </div>
-         </div>
-      </div>
-   </div>
-   <div class="btn-group pull-right">
-      <button  name="nextChef" id="nextChef" class="nextChef action-button" value="Next">Next</button>
-   </div>
-</form>
-<script>
-    //jQuery time
-    var current_fs, next_fs, previous_fs; //fieldsets
-    var left, opacity, scale; //fieldset properties which we will animate
-    var animating; //flag to prevent quick multi-click glitches
-
-    var $option = $('<option></option>').val(orgNameForSetup).attr('rowid',orgIdForSetup).html(orgNameForSetup);
-    $('#orgname').append($option);
-    $.get('/d4dMasters/readmasterjsonnew/16',function(data){
-      data = JSON.parse(data);
-        for(var i =0;i<data.length;i++){
-          if (data[i].templatetypename == 'Composite' || data[i].templatetypename == 'OSImage') {
-            continue;
-          }else {
-            if(orgIdForSetup == data[i].orgname_rowid) {
-              var $optionTemplates = $('<option></option>').val(data[i].templatetypename).attr('rowid',data[i].rowid).html(data[i].templatetypename);
-              $('#templatetypename').append($optionTemplates);
-            }  
-          }   
-        }
-    });
-    
-
-   
-
-   
-   function cancelClicked() {
-       $("#popupSelectProvider").modal('hide');
-       $(".modal-backdrop.fade.in").detach();
-       //$('#btncancel').click();
-   }
-   //function removeRow(curBtn) {
-   //  $(curBtn).closest('tr').detach();
-   //}
-   
-   function loadCookbookSelectorControl(chefserverid){
-       var csid = $('#' + chefserverid + ' option:selected').attr('rowid');
-      
-       if(csid != undefined){
-            //alert(csid);
-       var itms = $('#templatescookbooks').attr('savedvalue');
-       if(itms) {
-         itms = itms.split(',');
-       } else {
-         itms = [];
-       }
-       console.log(itms);
-       var $ccrs = $chefCookbookRoleSelector('usechefserver/' + csid,null,itms);
-        $('#templatescookbooks').empty().append($ccrs).data('$ccrs',$ccrs);
-   
-       }
-   }
-
-   function loadCookbookSelectorControlFromOrgId(orgId){
-       var csid = $('#' + orgId + ' option:selected').attr('rowid');
-      
-       if(csid != undefined){
-            //alert(csid);
-       var itms = $('#templatescookbooks').attr('savedvalue');
-       if(itms) {
-         itms = itms.split(',');
-       } else {
-         itms = [];
-       }
-       console.log(itms);
-       var $ccrs = $chefCookbookRoleSelector(csid,null,itms);
-        $('#templatescookbooks').empty().append($ccrs).data('$ccrs',$ccrs);
-   
-       }
-   }
-   
-
-
-   function inLineReady() {
-       //alert('in');
-   
-       $("input[type='text']").on("click", function () {
-           $(this).select();
-           $("#msgOrgName").hide();
-       });
-       // $("#popupSelectProvider").modal({ keyboard: false, backdrop: "static" });
-       $('#createproviderbody').css("display", "none");
-       $('#content').css("opacity", "1 !important");
-       // if (readform(9) == true) {  //9 is the reference for provider master. Function returns true if in not in edit mode
-       //     $("#launchProviderTypeSelection").click();
-       //  }
-       $("#popupSelectProvider").modal('hide');
-   
-       readform(17); //7 is for users
-       //
-   
-       //Force opening the left navigation menu
-       if ($('#navSettings').is(":visible") == false) {
-           $('#navSettings').css("display", '');
-           $('#navSettings > ul > li').first().addClass('open');
-           $('#navSettings > ul > li > ul').css("display", "none");
-           $('#navSettings > ul > li > ul').first().css("display", "block");
-       }
-       //redrawing the breadcrumb and selecting the tree
-       $('#settings li').removeClass('active');
-       $('#settings li').each(function () {
-           if ($(this).text().trim() == "Templates")
-               $(this).addClass('active');
-       });
-       $('#templatetypename').trigger('onchange');
-       drawBreadCrumb1();
-       enableUniqueCheckingForInputs(17);
-   
-   }
-   inLineReady();
-   //Copkbook popup functionality
-   function setfolderpath(){ //Uncomment below line to set the folder path to uploaded files.
-       var folderpath = ''; //'/' + $('#dockerreponame').val() + "/dockerfiles/";
-    //   alert(folderpath);
-           $('#folderpath').val(folderpath);
-   }
-   $("#btnaddToSuite").on('click', function () {
-       var x = document.getElementById("jsonFiles");
-       for (var i = 0; i < x.options.length; i++) {
-           if (x.options[i].selected == true) {
-               var y = document.createElement("option");
-               y.value = x.options[i].value;
-               y.innerHTML = x.options[i].text;
-               $("#suiteFiles").append(y);
-   
-           }
-       }
-   });
-   
-   $("#btnremoveFromSuite").on('click', function () {
-       $("#suiteFiles option:selected").remove();
-   });
-   
-   $("#btnSuiteItemUp").on('click', function () {
-       $("#suiteFiles option:selected").each(function () {
-           var listItem = $(this);
-           var listItemPosition = $("#suiteFiles option").index(listItem) + 1;
-   
-           if (listItemPosition == 1) return false;
-   
-           listItem.insertBefore(listItem.prev());
-       });
-   
-   });
-   
-   $("#btnSuiteItemDown").on('click', function () {
-       var itemsCount = $("#suiteFiles option").length;
-   
-       $($("#suiteFiles option:selected").get().reverse()).each(function () {
-           var listItem = $(this);
-           var listItemPosition = $("#suiteFiles option").index(listItem) + 1;
-   
-           if (listItemPosition == itemsCount) return false;
-   
-           listItem.insertAfter(listItem.next());
-   
-       });
-   });
-   
-    $("#donebutton").click(function () {
-   
-       var $contents = $("#suiteFiles option");
-       //alert($contents);
-       for (var i = 0; i < $contents.length; i++) {
-           var option = $contents.get(i);
-           //alert(option);
-           var x = option.value;
-           //alert(x);
-           
-           var y = $('<option>' + x + ' </option>').val(x);
-           //alert(y);
-           //$("#templatescookbooks").append(y);
-       }
-   });
-   
-   function loadChefServerObjects(chefServer){
-       $.get('/d4dMasters/' + chefServer + '/cookbooks', function(data) {
-           console.log(data);
-           var cookbooks = data.cookbooks;
-           var keys = Object.keys(cookbooks);
-           keys.sort(function(a,b){
-           return a.toLowerCase().localeCompare(b.toLowerCase());
-           });
-           var $deploymentCookbookList = $('.deploymentCookbookList').empty();
-           $deploymentCookbookList.append('<label class="label" style="text-align:center;">Select Cookbooks</label>');
-           var $inputtypetextCookbooks = $('<input type="text" style="height:24px;margin-left:2px;" placeholder="Search Cookbooks">').addClass('searchoptionforCookbooks form-control padding0');
-           $deploymentCookbookList.append($inputtypetextCookbooks);
-           for (i = 0; i < keys.length; i++) {
-               $deploymentCookbookList.append($('<li><label class="checkbox" style="margin: 5px;"><input type="checkbox"  name="checkboxCookbooks" value="recipe[' + keys[i] + ']" data-cookbookName="' + keys[i] + '"><i></i>' + keys[i] + '</label></li>'));
-           }
-           $('.searchoptionforCookbooks').keyup(function(e){
-               //alert('asdfgh');
-               var searchText = $(this).val();
-               $allListElements = $('.deploymentCookbookList > li');
-               $matchingListElements = $allListElements.filter(function(i,el){
-                   return $(el).text().indexOf(searchText) !== -1;
-               });
-               $allListElements.hide();
-               $matchingListElements.show();
-            });
-   
-           $.get('/d4dMasters/' + chefServer + '/roles', function(data) {
-               console.log(data);
-               var roles = data.roles;
-               var keys = Object.keys(roles);
-               keys.sort(function(a,b){
-               return a.toLowerCase().localeCompare(b.toLowerCase());
-               });
-               var $deploymentRolesList = $('.deploymentRolesList').empty();
-               $deploymentRolesList.append('<li><label class="label" style="text-align:center;">Select Roles</label></li>');
-               var $inputtypetextRoles = $('<input type="text" style="height:24px;margin-left:2px;" placeholder="Search Roles">').addClass('searchoptionforRoles form-control padding0');
-               $deploymentRolesList.append($inputtypetextRoles);
-               for (i = 0; i < keys.length; i++) {
-                   $deploymentRolesList.append($('<li><label class="checkbox" style="margin: 5px;"><input type="checkbox"  name="checkboxRoles" value="role[' + keys[i] + ']" data-roleName="' + keys[i] + '"><i></i>' + keys[i] + '</label></li>'));
-               }
-               $('.searchoptionforRoles').keyup(function(e){
-                   //alert('dsfvb');
-                   var searchText = $(this).val();
-                   $allListElements = $('.deploymentRolesList > li');
-                   $matchingListElements = $allListElements.filter(function(i,el){
-                       return $(el).text().indexOf(searchText) !== -1;
-                   });
-                   $allListElements.hide();
-                   $matchingListElements.show();
-                });
-               var itms = $('#templatescookbooks').attr('defaultvalues').split(',');
-               //alert(itms.length);
-               $.each(itms,function(k,v){
-                   $('.deploymentCookbookList li').find('input[value="' + v + '"]').prop('checked','true');
-                   $('.deploymentRolesList li').find('input[value="' + v + '"]').prop('checked','true');
-                   
-               });
-               $('#btnDeploymentAddSelectedCookbook').trigger('click');
-           });
-   
-       });
-   }
-   $('#btnDeploymentAddSelectedCookbook').click(function(e) {
-   var $deploymentSelectedList = $('.deploymentSelectedRunList');
-   var $selectedCookbooks = $("input[name=checkboxCookbooks]:checked");
-   $selectedCookbooks.each(function(idx) {
-       var $this = $(this);
-       $deploymentSelectedList.append($('<li><label style="margin: 5px;"><input type="hidden" value="' + $this.val() + '"/>' + $this.attr('data-cookbookName') + '</label></li>').on('click', function(e) {
-           if ($(this).hasClass('deploymentCookbookSelected')) {
-               $(this).removeClass('deploymentCookbookSelected');
-           } else {
-               $(this).addClass('deploymentCookbookSelected');
-           }
-       }));
-       $this.attr('checked', false);
-       $this.parents('li').hide();
-   
-   });
-   
-   var $selectedRoles = $("input[name=checkboxRoles]:checked");
-   $selectedRoles.each(function(idx) {
-       var $this = $(this);
-       $deploymentSelectedList.append($('<li><label style="margin: 5px;"><input type="hidden" value="' + $this.val() + '"/>' + $this.attr('data-roleName') + '</label></li>').on('click', function(e) {
-           if ($(this).hasClass('deploymentCookbookSelected')) {
-               $(this).removeClass('deploymentCookbookSelected');
-           } else {
-               $(this).addClass('deploymentCookbookSelected');
-           }
-       }));
-       $this.attr('checked', false);
-       $this.parents('li').hide();
-   
-   
-   });
-   
-   $deploymentSelectedList.sortable({
-       cursor: "move"
-   });
-   });
-   
-   $('#btnDeploymentRemoveSelectedCookbook').click(function(e) {
-   var $deploymentSelectedList = $('.deploymentSelectedRunList');
-   
-   $deploymentSelectedList.find('.deploymentCookbookSelected').each(function() {
-       var value = $(this).find('input').val();
-       var selector = 'input[name=checkboxRoles][value="' + value + '"]';
-       console.log(selector);
-       $('input[name=checkboxRoles][value="' + value + '"]').parents('li').show();
-       $('input[name=checkboxCookbooks][value="' + value + '"]').parents('li').show();
-       $(this).remove();
-   
-   });
-   
-   });
-   
-   //loadChefServerObjects($('#configname').val());
-   //Fix for default first item selection and cookbook load. - Vinood CAT-88
-   $('#configname').trigger('change');
-   $('#templatetypename').trigger('change');
-   $(document).ready(function() {
-           $("#templatename").focus();
-           $('#myForm6').submit(function() {
-                  
-                   var templateType = $('#templatetypename').val();
-                   if(templateType === 'Docker'){
-                        if($('#dockercontainers').val() != '')
-                        {
-                           $('#dockercontainerpaths').html('');
-                           addToTargetList($('#dockercontainers'),$('#templatename'));
-                        }
-                     }
-                   $(this).validate();
-                   if (templateType === 'Docker' || templateType === 'SoftwareStack' || location.toString().indexOf('?new') === -1) {
-
-                       $('#template').removeAttr('cat-validation', 'required');
-                       //Explicitly adding validation for repo path
-                       if(templateType === 'Docker' && $('#dockercontainerpaths').text() == "")
-                         $('#dockercontainers').attr('cat-validation','required');
-                       else
-                           {  
-                              $('#dockercontainers').removeAttr('cat-validation');
-                              
-                           }
-                         
-
-                       if ($(this).valid) {
-                           /*alert('valid form submitted'); // for demo*/
-                           if (validateForm()) {
-                               setfolderpath();
-                               saveform('17');
-                           };
-                       } else {
-                           alert('invalid form submitted'); // for demo
-                       }
-                   } else if (templateType === 'CloudFormation' || templateType === 'ARMTemplate' ){
-                     
-                           $('#template').attr('cat-validation', 'required');
-                           //explicity removing validation for repo path
-                           $('#dockercontainers').removeAttr('cat-validation');
-                           if ($(this).valid) {
-                               /*alert('valid form submitted'); // for demo*/
-                               if (validateForm()) {
-                                   setfolderpath();
-                                   saveform('17');
-                               };
-                           } else {
-                               alert('invalid valid form submitted'); // for demo
-                           }
-                       }
-                       return false; // for demo
-                   });
-           });
-       
-
-   
-
-     $(".nextChef").click(function(){
-      //toastr.success
-        toastr.success('Step 4 - Devops Roles Configuration Completed');
-        $('#trackConfiguration a').trigger('click');
-    });
-
-    $(".previous").click(function(){
-        if(animating) return false
-        animating = true;
-
-        current_fs = $(this).parent();
-        previous_fs = $(this).parent().prev();
-
-        //de-activate current step on progressbar
-        $("#progressbar li").eq($("form").index(current_fs)).removeClass("active");
-
-        //show the previous fieldset
-        previous_fs.show();
-        //hide the current fieldset with style
-        current_fs.animate({opacity: 0}, {
-            step: function(now, mx) {
-                //as the opacity of current_fs reduces to 0 - stored in "now"
-                //1. scale previous_fs from 80% to 100%
-                scale = 0.8 + (1 - now) * 0.2;
-                //2. take current_fs to the right(50%) - from 0%
-                left = ((1-now) * 50)+"%";
-                //3. increase opacity of previous_fs to 1 as it moves in
-                opacity = 1 - now;
-                current_fs.css({'left': left});
-                previous_fs.css({'transform': 'scale('+scale+')', 'opacity': opacity});
-            },
-            duration: 800,
-            complete: function(){
-                current_fs.hide();
-                animating = false;
-            },
-            //this comes from the custom easing plugin
-            easing: 'easeInOutBack'
-        });
-    });
-</script>
\ No newline at end of file
diff --git a/client/htmls/private/ajax/Settings/vmImageWizard.html b/client/htmls/private/ajax/Settings/vmImageWizard.html
index 8d651ffbe..ee2b5989e 100644
--- a/client/htmls/private/ajax/Settings/vmImageWizard.html
+++ b/client/htmls/private/ajax/Settings/vmImageWizard.html
@@ -1,10 +1,11 @@
+<div class="content">
 <form action="" id="myForm22">
    <div class="widget-box">
       <div class="widget-header">
          <h4 class="widget-margin" style="color:black;">Create VmImages</h4>
       </div>
       <div class="widget-body">
-         <div class="widget-main" style="min-height:200px">
+         <div class="widget-main" style="height:400px">
             <div class="jarviswidget" data-widget-editbutton="false" data-widget-custombutton="false">
                <div>
                   <!-- widget content -->
@@ -12,27 +13,27 @@ <h4 class="widget-margin" style="color:black;">Create VmImages</h4>
                      
                         <div class="col-lg-6">
                            <label for="">Name:<span class="control-label redSpan">&nbsp;*</span></label>
-                           <input name="ctl00$MainContent$orgname" placeholder="Please Enter Image Name" id="name" class="form-control" type="text"  cdata="catalyst" cat-validation="required,max15">
+                           <input name="ctl00$MainContent$orgname" placeholder="Please Enter Image Name" id="name" class="form-control imageNameForVM" type="text"  cdata="catalyst" cat-validation="required,max15">
                         </div>
                         <div class="col-lg-6">
                            <label for="name">Organization Name:<span class="control-label redSpan">&nbsp;*</span></label>
                            <select id="orgId" name="orgId" unique="true" uniqueconditionedby="orgname"  class="form-control chooseOrganization width-100" style="vertical-align:central"  cdata="catalyst"  cat-validation="required">
-                              <option value="">Select Organization</option>
                            </select>
                         </div>
                      
                      
                         <div class="col-lg-6 margintop20">
                            <label for="name">Choose Provider:<span class="control-label redSpan">&nbsp;*</span></label>
-                           <select id="providerId" disabled="disabled" unique="true" uniqueconditionedby="orgname"  class="form-control chooseOrganization width-100" datapath="masterjson.rows.row" valuelinkfield="costcode" style="vertical-align:central"  cdata="catalyst"  cat-validation="required">
+                           <select id="providerId" disabled="disabled" unique="true" uniqueconditionedby="orgname"  class="form-control chooseOrganization width-100 providerVMImageDisplay" datapath="masterjson.rows.row" valuelinkfield="costcode" style="vertical-align:central">
                               <option value="">Choose Provider</option>
                            </select>
+                           <input id="providerIdHiddenName" disabled="disabled" unique="true" uniqueconditionedby="orgname"  class="hidden form-control chooseOrganization width-100" datapath="masterjson.rows.row" valuelinkfield="costcode" style="vertical-align:central">
                         </div>
                         <div class="col-lg-6 margintop20">
                            <label for="name">Operating System:<span class="control-label redSpan">&nbsp;*</span></label>
                            <select id="osType" unique="true" uniqueconditionedby="orgname"  class="form-control chooseOrganization width-100" style="vertical-align:central"  cdata="catalyst"  cat-validation="required">
-                              <option value="">Select OS</option>
                            </select>
+                           <input id="osType" disabled="disabled" unique="true" uniqueconditionedby="orgname"  class="hidden form-control chooseOrganization width-100" style="vertical-align:central"  cdata="catalyst"/>
                         </div>
                      
                      
@@ -54,233 +55,198 @@ <h4 class="widget-margin" style="color:black;">Create VmImages</h4>
             </div>
          </div>
       </div>
-   </div>
-   <div class="btn-group pull-right">
-      <button  name="nextChef" id="nextChef" class="nextChef action-button" value="Next">Next</button>
+      <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>
+             <input type="button" disabled="disabled" name="next1" id="next1" class="nextFormWizard btn btn-primary" value="Next"/>
+          </div>
+       </div>
    </div>
 </form>
+</div>
 <script>
-    //jQuery time
-    var current_fs, next_fs, previous_fs; //fieldsets
-    var left, opacity, scale; //fieldset properties which we will animate
-    var animating; //flag to prevent quick multi-click glitches
-
     var $option = $('<option></option>').val(orgIdForSetup).html(orgNameForSetup);
     $('#orgId').append($option);
     $("#orgId").on('change', function(e) {
         getProviderList($("#orgId").val());
-    });    
-
-function appendLoader() {
-    removeLoader();
-    $("form[id*='myForm']").find("div.pull-right > button").attr('disabled', 'disabled').parent().prepend('<label id="masterssavespinner" class="" style="float:left;"><img  style="margin-left:5px;margin-right:25px;margin-top:8px;" src="img/select2-spinner.gif" /></label>');
-}
-
-function removeLoader() {
-    $('#masterssavespinner').remove();
-    $("form[id*='myForm']").find("div.pull-right > button").removeAttr('disabled');
-}
+    });
+    $('#orgId').trigger('change');
+    function appendLoader() {
+        removeLoader();
+        $("form[id*='myForm']").find("div.pull-right > button").attr('disabled', 'disabled').parent().prepend('<label id="masterssavespinner" class="" style="float:left;"><img  style="margin-left:5px;margin-right:25px;margin-top:8px;" src="img/select2-spinner.gif" /></label>');
+    }
 
-function getProviderList(_val) {
+    function removeLoader() {
+        $('#masterssavespinner').remove();
+        $("form[id*='myForm']").find("div.pull-right > button").removeAttr('disabled');
+    }
 
-    $.ajax({
-        type: "GET",
-        url: "/allproviders/list",
-        success: function(data) {
-            var str = "";
-            for (var key in data) {
-                if (data.hasOwnProperty(key)) {
+    function getProviderList(_val) {
 
-                    for (var i = 0; i < data[key].length; i++) {
-                        if (_val == data[key][i].orgId) {
-                            if (key === "awsProviders") {
-                                str = str + '<option value="' + data[key][i]._id + '" secretKey="' + data[key][i].secretKey + '" accessKey="' + data[key][i].accessKey + '" providerType="' + data[key][i].providerType + '">' + data[key][i].providerName + '</option>';
-                            } else if (key === "openstackProviders") {
-                                str += '<option value="' + data[key][i]._id + '" username="' + data[key][i].userName + '" password="' + data[key][i].password + '" providerType="' + data[key][i].providerType + '">' + data[key][i].providerName + '</option>';
-                            } else if (key === "vmwareProviders") {
-                                str += '<option value="' + data[key][i]._id + '" username="' + data[key][i].userName + '" password="' + data[key][i].password + '" providerType="' + data[key][i].providerType + '">' + data[key][i].providerName + '</option>';
-                            } else if (key === "hpPlublicCloudProviders") {
-                                str += '<option value="' + data[key][i]._id + '" username="' + data[key][i].userName + '" password="' + data[key][i].password + '" providerType="' + data[key][i].providerType + '">' + data[key][i].providerName + '</option>';
-                            } else if (key === "azureProviders") {
-                                str += '<option value="' + data[key][i]._id + '" subscriptionId="' + data[key][i].subscriptionId + '" storageAccount="' + data[key][i].storageAccount + '" providerType="' + data[key][i].providerType + '">' + data[key][i].providerName + '</option>';
+        $.ajax({
+            type: "GET",
+            url: "/allproviders/list",
+            success: function(data) {
+                var str = "";
+                for (var key in data) {
+                    if (data.hasOwnProperty(key)) {
+                        for (var i = 0; i < data[key].length; i++) {
+                            if (_val == data[key][i].orgId) {
+                                if (key === "awsProviders") {
+                                    str = str + '<option value="' + data[key][i]._id + '" secretKey="' + data[key][i].secretKey + '" accessKey="' + data[key][i].accessKey + '" providerType="' + data[key][i].providerType + '">' + data[key][i].providerName + '</option>';
+                                } else if (key === "openstackProviders") {
+                                    str += '<option value="' + data[key][i]._id + '" username="' + data[key][i].userName + '" password="' + data[key][i].password + '" providerType="' + data[key][i].providerType + '">' + data[key][i].providerName + '</option>';
+                                } else if (key === "vmwareProviders") {
+                                    str += '<option value="' + data[key][i]._id + '" username="' + data[key][i].userName + '" password="' + data[key][i].password + '" providerType="' + data[key][i].providerType + '">' + data[key][i].providerName + '</option>';
+                                } else if (key === "hpPlublicCloudProviders") {
+                                    str += '<option value="' + data[key][i]._id + '" username="' + data[key][i].userName + '" password="' + data[key][i].password + '" providerType="' + data[key][i].providerType + '">' + data[key][i].providerName + '</option>';
+                                } else if (key === "azureProviders") {
+                                    str += '<option value="' + data[key][i]._id + '" subscriptionId="' + data[key][i].subscriptionId + '" storageAccount="' + data[key][i].storageAccount + '" providerType="' + data[key][i].providerType + '">' + data[key][i].providerName + '</option>';
+                                }
                             }
                         }
                     }
                 }
-            }
-            
-            $('#providerId').html(str);
-            $('#providerId option:eq(0)').attr('selected', 'selected');
-            $('#providerId').prop("disabled", false);
-
-            if ($('#providerId').attr('answer')) {
-                $('#providerId').val($('#providerId').attr('answer'));
-            }
-            
 
-            $('#osType').on('change',function(){
-              var ostype = $('#osType').find("option:selected").val();
-              if($('#osType').val() == 'Windows'){
-                  $('.forazurepassword').find('#password').attr('cat-validation', 'required,min8');
-                  $('.forazurepassword label').html('Admin  Password:').append('<span class="control-label redSpan">&nbsp;*</span>');
-              }else{
-                  $('.forazurepassword label').html('Admin  Password:');
-                  $('.forazurepassword').find('#password').removeAttr('cat-validation');
-              }
-            });
-        }
+                $('#providerId').html(str);
+                $('#providerId option:eq(0)').attr('selected', 'selected');
+                $('#providerId').prop("disabled", false);
 
-    });
-}
+                if ($('#providerId').attr('answer')) {
+                    $('#providerId').val($('#providerId').attr('answer'));
+                }
 
-function saveImageForm() {
-    appendLoader();
-    var imageIdentifier = $('#imageidentifire').val().trim(),
-        name = $('#name').val().trim(),
-        osName = $('#osType').val().trim(),
-        providerId = $('#providerId').val().trim(),
-        url, osType = $('#osType').find('option:selected').attr('ostype'),
-        userName = $('#UserName').val(),
-        orgId = $('#orgId').val().trim();
-    var pt = $('#providerId').find('option:selected').attr('providertype');
-    //alert(orgId);
 
-    var password = $('#password').val().trim();
+                $('#osType').on('change', function() {
+                    var ostype = $('#osType').find("option:selected").val();
+                    if ($('#osType').val() == 'Windows') {
+                        $('.forazurepassword').find('#password').attr('cat-validation', 'required,min8');
+                        $('.forazurepassword label').html('Admin  Password:').append('<span class="control-label redSpan">&nbsp;*</span>');
+                    } else {
+                        $('.forazurepassword label').html('Admin  Password:');
+                        $('.forazurepassword').find('#password').removeAttr('cat-validation');
+                    }
+                });
+            }
+        });
+    }
 
-    if (imageIdentifier && providerId && osType && name && osName && userName && orgId) {
+    function saveImageForm() {
         appendLoader();
-        if (!UtilityMethods.getIdFromURL()) {
-            url = "/vmimages";
-        } 
+        var imageIdentifier = $('#imageidentifire').val().trim(),
+            name = $('#name').val().trim(),
+            osName = $('#osType').val().trim(),
+            providerId = $('#providerId').val().trim(),
+            url, osType = $('#osType').find('option:selected').attr('ostype'),
+            userName = $('#UserName').val(),
+            orgId = $('#orgId').val().trim();
+        var pt = $('#providerId').find('option:selected').attr('providertype');
+        //alert(orgId);
+
+        var password = $('#password').val().trim();
+
+        if (imageIdentifier && providerId && osType && name && osName && userName && orgId) {
+            appendLoader();
+            if (!UtilityMethods.getIdFromURL()) {
+                url = "/vmimages";
+            }
 
-        //debugger;
-        $.ajax({
-            method: "POST",
-            url: url,
-            data: {
-                "providerId": providerId,
-                "osType": osType,
-                "name": name,
-                "imageIdentifier": imageIdentifier,
-                "osName": osName,
-                "userName": userName,
-                "orgId": orgId,
-                "providertype": pt,
-                "password": password
-            },
-            success: function(data, success) {
-                if (data != 500) {
-                    if ($('#btncancel').length) {
-                        $('#btncancel').click();
+            //debugger;
+            $.ajax({
+                method: "POST",
+                url: url,
+                data: {
+                    "providerId": providerId,
+                    "osType": osType,
+                    "name": name,
+                    "imageIdentifier": imageIdentifier,
+                    "osName": osName,
+                    "userName": userName,
+                    "orgId": orgId,
+                    "providertype": pt,
+                    "password": password
+                },
+                success: function(data, success) {
+                    if (data != 500) {
+                        if ($('#btncancel').length) {
+                            $('#btncancel').click();
+                        }
+                        removeLoader();
+                        $('.nextFormWizard').removeAttr('disabled','disabled');
+                    } else {
+                        removeLoader();
+                        alert(data.toString());
                     }
+                },
+                error: function(jqxhr) {
                     removeLoader();
-                } else {
+                    bootbox.alert(jqxhr.responseText);
+                },
+                failure: function(data) {
+                    bootbox.alert(data.responseText);
                     removeLoader();
-                    alert(data.toString());
                 }
-            },
-            error: function(jqxhr) {
-                removeLoader();
-                bootbox.alert(jqxhr.responseText);
+            });
+
+        }
+    }
+
+    function populateOSList() {
+        $.ajax({
+            type: "GET",
+            url: "/vmimages/os/type/all/list",
+            success: function(data) {
+                data = typeof data == "string" ? JSON.parse(data) : data;
+                var str = ' <option value="">Select OS Type</option>',
+                    len = data.length;
+                for (var i = 0; i < len; i++) {
+                    str = str + '<option value="' + data[i]["os_name"] + '" ostype="' + data[i]["osType"] + '">' + data[i]["os_name"] + '</option>';
+
+                }
+                $('#osType').html(str);
+                if ($('#osType').attr('answer')) {
+                    $('#osType').val($('#osType').attr('answer'));
+                }
             },
             failure: function(data) {
-                bootbox.alert(data.responseText);
-                removeLoader();
+                alert(data.toString());
             }
         });
-
     }
-}
-
-function populateOSList() {
-    $.ajax({
-        type: "GET",
-        url: "/vmimages/os/type/all/list",
-        success: function(data) {
-            data = typeof data == "string" ? JSON.parse(data) : data;
-            var str = ' <option value="">Select OS Type</option>',
-                len = data.length;
-            for (var i = 0; i < len; i++) {
-                str = str + '<option value="' + data[i]["os_name"] + '" ostype="' + data[i]["osType"] + '">' + data[i]["os_name"] + '</option>';
 
-            }
-            $('#osType').html(str);
-            if ($('#osType').attr('answer')) {
-                $('#osType').val($('#osType').attr('answer'));
+    var UtilityMethods = {
+        initTooltip: function() {
+            var $tool = $("[rel=tooltip]");
+            if ($tool.length) {
+                $tool.tooltip();
             }
         },
-        failure: function(data) {
-            alert(data.toString());
-        }
-    });
-}
-
-var UtilityMethods = {
-    initTooltip: function() {
-        var $tool = $("[rel=tooltip]");
-        if ($tool.length) {
-            $tool.tooltip();
-        }
-    },
-    getRandomNumber: function() {
-        return parseInt(Math.random() * 10000000000);
-    },
-    getIdFromURL: function() {
-        var options = location.toString().split('?');
-        return options.length > 1 ? (options[1] !== "new" ? options[1] : "") : "";
-    }
-};
-
-$(document).ready(function() {
-    $("#name").focus();
-    $('#myForm22').submit(function() {
-        if (isFormValid()) {
-            saveImageForm();
-        } else {
+        getRandomNumber: function() {
+            return parseInt(Math.random() * 10000000000);
+        },
+        getIdFromURL: function() {
+            var options = location.toString().split('?');
+            return options.length > 1 ? (options[1] !== "new" ? options[1] : "") : "";
         }
-        return false; // for demo
+    };
+
+    $(document).ready(function() {
+        $("#name").focus();
+        $('#myForm22').submit(function() {
+            if (isFormValid()) {
+                saveImageForm();
+            } else {}
+            return false;
+        });
+        populateOSList();
     });
-    populateOSList();
-});
 
 
-    $(".nextChef").click(function(){
+    $(".nextFormWizard").click(function() {
+        $('#galleryConfiguration a').attr('href','ajax/Settings/galleryWizard.html');
         toastr.success('Step 3 - Provider Configuration Setup Completed');
-        $('#devopsConfiguration a').trigger('click');
-    });
-
-    $(".previous").click(function(){
-        if(animating) return false;
-        animating = true;
-
-        current_fs = $(this).parent();
-        previous_fs = $(this).parent().prev();
-
-        //de-activate current step on progressbar
-        $("#progressbar li").eq($("form").index(current_fs)).removeClass("active");
-
-        //show the previous fieldset
-        previous_fs.show();
-        //hide the current fieldset with style
-        current_fs.animate({opacity: 0}, {
-            step: function(now, mx) {
-                //as the opacity of current_fs reduces to 0 - stored in "now"
-                //1. scale previous_fs from 80% to 100%
-                scale = 0.8 + (1 - now) * 0.2;
-                //2. take current_fs to the right(50%) - from 0%
-                left = ((1-now) * 50)+"%";
-                //3. increase opacity of previous_fs to 1 as it moves in
-                opacity = 1 - now;
-                current_fs.css({'left': left});
-                previous_fs.css({'transform': 'scale('+scale+')', 'opacity': opacity});
-            },
-            duration: 800,
-            complete: function(){
-                current_fs.hide();
-                animating = false;
-            },
-            //this comes from the custom easing plugin
-            easing: 'easeInOutBack'
-        });
+        $('#galleryConfiguration a').trigger('click');
+        $('#startConfig a, #orgConfiguration a,#configManagement a,#providerConfiguration a').addClass('green-btn').removeClass('process-btn');
+        $('.wizardFlow').empty();
     });
 </script>
\ No newline at end of file
diff --git a/client/htmls/private/ajax/Settings/wizardIntro.html b/client/htmls/private/ajax/Settings/wizardIntro.html
new file mode 100644
index 000000000..f4ea5a5a7
--- /dev/null
+++ b/client/htmls/private/ajax/Settings/wizardIntro.html
@@ -0,0 +1,34 @@
+<div class="content">
+   <div class="widget-box">
+      <div class="widget-main" style="min-height:200px">
+         <div class="jarviswidget" id="wid-id-3" data-widget-editbutton="false" data-widget-custombutton="false">
+            <div>
+               <div class="widget-body no-padding" id="introWizard">
+                  <h3 class="introText">This wizard will help you to setup and configure Catalyst to manage DevOps assets across data center and cloud.</h3>
+                  <ul>
+                     <li><span class="introHeader">1.&nbsp;Configuration Management:</span><span class="introTextDescription">&nbsp;Configure your own chef server. You can add either a hosted chef server or an on-premise installation of chefserver.</span></li>
+                     <br/>
+                     <li><span class="introHeader">2.&nbsp;Provider Configuration:</span>&nbsp;<span class="introTextDescription">You can configure multiple cloud provider accounts of type Aws, Azure, OpenStack and VmWare within RLCatalyst.</span></li>
+                     <br/>
+                     <li><span class="introHeader">3.&nbsp;Repositories:</span>&nbsp;<span class="introTextDescription">You can configure Nexus repository, Docker Repository and Jenkins Server.</span></li>
+                     <br/>
+                     <li><span class="introHeader">4.&nbsp;Telemetry Configuration:</span>&nbsp;<span class="introTextDescription">Configure ELK, StackStorm and Sensu application for monitoring heath of the data center.</span></li>
+                     <br/>
+                     <li><span class="introHeader">5.&nbsp;CMDB Configuration:</span>&nbsp;<span class="introTextDescription">You can configure Configure ServiceNow ITMS application.</span></li>
+                  </ul>
+               </div>
+            </div>
+         </div>
+      </div>
+      <div class="widget-toolbox clearfix">
+         <div class="btn-group pull-right">
+            <input type="button" name="next1" id="next1" class="nextFormWizard btn btn-primary" value="Next"/>
+         </div>
+      </div>
+   </div>
+</div>
+<script>
+$('.nextFormWizard').click(function(e) {
+    $('#orgConfiguration 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 b79229fdb..857d2a915 100644
--- a/client/htmls/private/css/catalyst.css
+++ b/client/htmls/private/css/catalyst.css
@@ -1243,11 +1243,11 @@ nav ul ul>li:hover b {
     border: 1px solid #ddd;
     border-top: 0;
 }
-.btn,
+/*.btn,
 a:link,
 button {
     -webkit-tap-highlight-color: rgba(169, 3, 41, .5);
-}
+}*/
 #logo-group *,
 .tree-view,
 .tree-view *,
diff --git a/client/htmls/private/css/wizardBg.css b/client/htmls/private/css/wizardBg.css
new file mode 100644
index 000000000..27058a040
--- /dev/null
+++ b/client/htmls/private/css/wizardBg.css
@@ -0,0 +1,341 @@
+/*
+Template Name: Color Admin - Responsive Admin Dashboard Template build with Twitter Bootstrap 3.3.6
+Version: 2.0.0
+Author: Sean Ngu
+Website: http://www.seantheme.com/color-admin-v2.0/admin/html/
+*/
+.bwizard-steps {
+    font-size: 14px!important;
+    border-radius: 3px!important;
+    display: table!important;
+    width: 100%!important
+}
+
+.bwizard-steps li:after,
+.bwizard-steps li:before {
+    border: none!important
+}
+
+.bwizard-steps li {
+    float: none!important;
+    display: table-cell!important;
+    padding: 15px!important;
+    line-height: 20px!important;
+    background: #d2cbcb;
+    -webkit-border-radius: 0!important;
+    -moz-border-radius: 0!important;
+    border-radius: 0!important
+}
+
+.bwizard-steps li:focus,
+.bwizard-steps li:hover {
+    background: #d3dadf!important
+}
+
+.bwizard-steps li small {
+    font-size: 11px!important;
+    color: #999!important;
+    display: block!important;
+    line-height: 14px!important
+}
+
+.bwizard-steps li a {
+    margin-left: 30px!important;
+    display: block!important
+}
+
+.bwizard-steps li.active small {
+    color: #b2e6e6!important
+}
+
+.bwizard-steps .label {
+    float: left!important;
+    padding: 0!important;
+    height: 20px!important;
+    width: 20px!important;
+    line-height: 20px!important;
+    text-align: center!important;
+    margin-right: 10px!important;
+    top: 0!important;
+    background: #6d7479!important;
+    -webkit-border-radius: 50%!important;
+    -moz-border-radius: 50%!important;
+    border-radius: 50%!important
+}
+
+.bwizard-steps li.active,
+.bwizard-steps li.active:focus,
+.bwizard-steps li.active:hover {
+    background: #286090!important
+}
+
+/*.bwizard-steps li.active .label {
+    background: url(../img/transparent/black-0.2.png)!important;
+    background: rgba(0, 0, 0, .2)!important
+}*/
+.bwizard {
+    position: relative
+}
+
+.bwizard .well {
+    margin: 10px 0 -10px 0
+}
+
+.bwizard-steps {
+    margin: 0;
+    padding: 0;
+    display: inline-block;
+    background: #fff
+}
+
+.bwizard-steps li:first-child {
+    -moz-border-radius: 4px 0 0 4px;
+    -webkit-border-radius: 4px 0 0 4px;
+    border-radius: 4px 0 0 4px;
+    padding-left: 12px
+}
+
+.bwizard-steps li:first-child:before {
+    border: 0
+}
+
+.bwizard-steps li:last-child {
+    -moz-border-radius: 0 4px 4px 0;
+    -webkit-border-radius: 0 4px 4px 0;
+    border-radius: 0 4px 4px 0;
+    margin-right: 0
+}
+
+.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;
+    padding: 1px 5px 2px;
+    position: relative;
+    top: -1px
+}
+
+.bwizard-steps .active {
+    color: #fff;
+    background: #007acc
+}
+
+.bwizard-steps .active:after {
+    border-left-color: #007acc
+}
+
+.bwizard-steps a {
+    color: #fff
+}
+
+.bwizard-steps .active a {
+    color: #fff;
+    cursor: default
+}
+
+.bwizard-steps a:hover {
+    text-decoration: none
+}
+
+/*.bwizard-steps.clickable li:not(.active) {
+    cursor: pointer
+}*/
+
+.bwizard-steps.clickable li:hover:not(.active) {
+    background: #ccc
+}
+
+.bwizard-steps.clickable li:hover:not(.active) a {
+    color: #08c
+}
+
+.bwizard-steps.clickable li:hover:not(.active):after {
+    border-left-color: #ccc
+}
+
+.contentSetting .content {
+        margin:0 auto;
+        padding: 10px;
+}
+
+.green-btn {
+    background-color: #5cb85c!important;
+    color:#fff!important;
+}
+
+.wizardContainer {
+        width: 1166px;
+        height: 130px;
+        margin-top: 20px;
+    }
+    
+    .wizardbtn-circle {
+        width: 49px;
+        height: 49px;
+        text-align: center;
+        padding: 5px 0;
+        font-size: 20px;
+        line-height: 2.00;
+        border-radius: 30px;
+        margin: 0 25px;
+    }
+    
+    .wizardbtn-text {
+        font-size: 12px;
+        vertical-align: middle;
+        line-height: 3;
+    }
+    
+    .wizardActiveBtn {
+        background-color: #286090;
+        color: #fff!important;
+        box-shadow: 0 0 5px #286090;
+    }
+    
+    .green-btn {
+        background-color: #5cb85c;
+        color: #fff;
+        box-shadow: 0 0 5px #286090;
+    }
+    
+    .red-btn {
+        background-color: red;
+        color: #fff;
+        box-shadow: 0 0 5px #286090;
+    }
+    
+    .process-btn {
+        background-color: #d2cbcb;
+        /*#7d7676*/
+        color: #fff;
+        box-shadow: 0 0 5px #888888;
+    }
+    
+    .end-btn {
+        background-color: #40BAF1;
+        color: #fff;
+        box-shadow: 0 0 5px #40BAF1;
+    }
+    
+    #introWizard ul li {
+        text-decoration: none;
+        list-style: none;
+    }
+    
+    .li-margin {
+        margin: 0 20px;
+        width: 30px;
+    }
+    
+    .btn-cls {
+        margin: 1px 28px;
+        width: 90%;
+        background: hsla(0, 0%, 0%, 0) url("../../private/img/dot.jpg") no-repeat scroll -27px 25px;
+        height: 45px;
+    }
+    
+    .btn-1 {
+        float: left;
+        text-align: center;
+        padding: 0 15px;
+    }
+    
+    .wizardLabelName {
+        padding-top: 10px;
+        color: #7d7676;
+    }
+    
+    .wizardFormControls {   
+        display: inline;
+        height: 32px;
+        padding: 6px 12px;
+        font-size: 13px;
+        line-height: 1.428571429;
+        color: #555;
+        vertical-align: middle;
+        background-color: #fff;
+        background-image: none;
+        border: 1px solid #ccc;
+        transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+        height: 29px;
+    }
+    
+    .marginRight20 {
+        margin-right: 20px;
+    }
+    
+    #wizardActionListLoader {
+        opacity: 0.6;
+        height: 100%;
+        width: 100%;
+        position: absolute;
+        background: #ddd;
+    }
+
+    .introText{
+        margin-top: -10px;
+        color:#286090;
+    }
+    .introHeader{
+        font-size: 17px;
+        color:#286090;
+    }
+    .introTextDescription {
+        font-size: 16px;
+        color:#7d7676;
+    }
+
+    .not-activeAnchor {
+        pointer-events: none;
+        cursor: default;
+    }
+
+    .addimage,.removeimage {
+    cursor: pointer;
+}
+
+.addNewRegion {
+    border: solid gray 1px;
+    padding: 10px;
+    margin-bottom: 15px;
+}
+
+.addRow,.removeRow {
+    float: left;
+    margin-top: 32px;
+    margin-left: 3.5px;
+}
+
+.addRegion,.removeRegion {
+    position: relative;
+    top: -18px;
+    left: 17px;
+    float: right;
+}
\ No newline at end of file
diff --git a/client/htmls/private/index.html b/client/htmls/private/index.html
index e3b419898..b63715e3d 100644
--- a/client/htmls/private/index.html
+++ b/client/htmls/private/index.html
@@ -14,6 +14,7 @@
     <link rel="stylesheet" type="text/css" media="screen" href="css/font-awesome.min.css">
     <link rel="stylesheet" href="js/jquery-filetree/jqueryFileTree.css" />
     <link rel="stylesheet" type="text/css"  href="css/toastr.min.css">
+    <link rel="stylesheet" type="text/css" media="screen" href="css/wizardBg.css">
   </head>
   <body class="custom-theme">
     <!-- HEADER -->
@@ -844,7 +845,7 @@ <h4 class="modal-title">
 window.selectedOrgName = $('.orgSelected').text().trim();
 var SettingTreeJson = [{
         "name": "organizationsetup",
-        "text": "Organization Setup",
+        "text": "Org Configuration",
         "icon": "fa fa-lg fa-fw fa-building",
         "nodetype": "org",
         "nodes": [{
@@ -877,15 +878,6 @@ <h4 class="modal-title">
             "selectable": true,
             "icon": "fa fa-lg fa-fw fa-tags"
 
-        },{
-            "name": "organizations",
-            "text": "Environments",
-            "borderColor": "#000",
-            "href": "#ajax/Settings/EnvironmentConceptList.html",
-            "selectable": true,
-            "icon": "fa fa-lg fa-fw fa-tint",
-            "parent": "devops",
-            "nodetype": "EnvironmentConceptList"
         }],
         "borderColor": "#000",
         "selectable": false,
@@ -894,7 +886,7 @@ <h4 class="modal-title">
 
     }, {
         "name": "config setup",
-        "text": "Config Setup",
+        "text": "Config Management",
         "nodes": [{
             "name": "organizations",
             "text": "Chef Server",
@@ -910,14 +902,95 @@ <h4 class="modal-title">
             "selectable": true,
             "icon": "fa fa-lg fa-fw fa-random"
 
+        },{
+            "name": "organizations",
+            "text": "Environments",
+            "borderColor": "#000",
+            "href": "#ajax/Settings/EnvironmentConceptList.html",
+            "selectable": true,
+            "icon": "fa fa-lg fa-fw fa-tint",
+            "parent": "devops",
+            "nodetype": "EnvironmentConceptList"
+        }, {
+            "name": "organizations",
+            "text": "Teams",
+            "borderColor": "#000",
+            "href": "#ajax/Settings/TeamsList.html",
+            "selectable": true,
+            "icon": "fa fa-lg fa-fw fa-users"
+
         }],
         "borderColor": "#000",
         "selectable": false,
         "href": "javascript:void(0);",
         "icon": "fa-lg fa-fw fa fa-tachometer"
-    },  {
+    }, {
+        "name": "provider setup",
+        "text": "Provider Configuration",
+        "nodes": [{
+            "name": "organizations",
+            "text": "Providers",
+            "borderColor": "#000",
+            "href": "#ajax/Settings/ProvidersList.html",
+            "selectable": true,
+            "icon": "fa fa-lg fa-fw fa-sitemap"
+        }, {
+            "name": "organizations",
+            "text": "VMImage",
+            "borderColor": "#000",
+            "href": "#ajax/Settings/ImagesList.html",
+            "selectable": true,
+            "icon": "fa fa-lg fa-fw fa-image"
+
+        }],
+        "borderColor": "#000",
+        "selectable": false,
+        "href": "javascript:void(0);",
+        "icon": "fa fa-lg fa-fw fa-sitemap"
+    }, {
+        "name": "gallerysetup",
+        "text": "Gallery Setup",
+        "icon": "fa fa-lg fa-fw fa-building",
+        "nodes": [{
+            "name": "templates",
+            "text": "Template Types",
+            "borderColor": "#000",
+            "href": "#ajax/Settings/DesignTemplateTypesList.html",
+            "selectable": true,
+            "icon": "fa fa-lg fa-fw fa-files-o"
+
+        }, {
+            "name": "organizations",
+            "text": "Templates",
+            "borderColor": "#000",
+            "href": "#ajax/Settings/TemplatesList.html",
+            "selectable": true,
+            "icon": "fa fa-lg fa-fw fa-files-o"
+
+        }, {
+            "name": "organizations",
+            "text": "Service Command",
+            "borderColor": "#000",
+            "href": "#ajax/Settings/ServiceCommandList.html",
+            "selectable": true,
+            "icon": "fa fa-lg fa-fw fa-terminal"
+
+        }, {
+            "name": "organizations",
+            "text": "Script Gallery",
+            "borderColor": "#000",
+            "href": "#ajax/Settings/scriptList.html",
+            "selectable": true,
+            "icon": "fa fa-lg fa fa-folder-o"
+
+        }],
+        "borderColor": "#000",
+        "selectable": false,
+        "href": "javascript:void(0);"
+
+    }, {
         "name": "devopssetup",
-        "text": "DevOps Setup",
+        "text": "DevOps Roles",
         "icon": "fa fa-lg fa-fw fa-qrcode",
         "nodetype": "devops",
         "nodes": [{
@@ -944,23 +1017,7 @@ <h4 class="modal-title">
                 "selectable": true,
                 "icon": "fa fa-lg fa-fw fa-link"
 
-            }, {
-                "name": "organizations",
-                "text": "Providers",
-                "borderColor": "#000",
-                "href": "#ajax/Settings/ProvidersList.html",
-                "selectable": true,
-                "icon": "fa fa-lg fa-fw fa-sitemap"
-            }, {
-                "name": "organizations",
-                "text": "CMDB",
-                "borderColor": "#000",
-                "href": "#ajax/Settings/cmdbList.html",
-                "selectable": true,
-                "icon": "fa fa-lg fa-fw fa-database"
-            },
-
-        ],
+            }],
         "borderColor": "#000",
         "selectable": false,
         "href": "javascript:void(0);"
@@ -985,83 +1042,41 @@ <h4 class="modal-title">
             "selectable": true,
             "icon": "fa fa-lg fa-fw fa-user"
 
-        }, {
-            "name": "organizations",
-            "text": "Teams",
-            "borderColor": "#000",
-            "href": "#ajax/Settings/TeamsList.html",
-            "selectable": true,
-            "icon": "fa fa-lg fa-fw fa-users"
-
         }],
         "borderColor": "#000",
         "selectable": false,
         "href": "javascript:void(0);"
 
     }, {
-        "name": "gallerysetup",
-        "text": "Gallery Setup",
-        "icon": "fa fa-lg fa-fw fa-building",
+        "name": "track",
+        "text": "Track Setup",
         "nodes": [{
             "name": "templates",
-            "text": "Template Types",
-            "borderColor": "#000",
-            "href": "#ajax/Settings/DesignTemplateTypesList.html",
-            "selectable": true,
-            "icon": "fa fa-lg fa-fw fa-files-o"
-
-        }, {
-            "name": "organizations",
-            "text": "Templates",
+            "text": "Dashboards",
             "borderColor": "#000",
-            "href": "#ajax/Settings/TemplatesList.html",
+            "href": "#ajax/Settings/DashboardSettings.html",
             "selectable": true,
             "icon": "fa fa-lg fa-fw fa-files-o"
-
-        }, {
-            "name": "organizations",
-            "text": "Service Command",
-            "borderColor": "#000",
-            "href": "#ajax/Settings/ServiceCommandList.html",
-            "selectable": true,
-            "icon": "fa fa-lg fa-fw fa-terminal"
-
-        }, {
-            "name": "organizations",
-            "text": "VMImage",
-            "borderColor": "#000",
-            "href": "#ajax/Settings/ImagesList.html",
-            "selectable": true,
-            "icon": "fa fa-lg fa-fw fa-image"
-
-        }, {
-            "name": "organizations",
-            "text": "Script Gallery",
-            "borderColor": "#000",
-            "href": "#ajax/Settings/scriptList.html",
-            "selectable": true,
-            "icon": "fa fa-lg fa fa-folder-o"
-
         }],
         "borderColor": "#000",
         "selectable": false,
-        "href": "javascript:void(0);"
-
+        "href": "javascript:void(0);",
+        "icon": "fa-lg fa-fw fa fa-tachometer"
     }, {
-        "name": "track",
-        "text": "Track Setup",
+        "name": "cmdb",
+        "text": "CMDB Configuration",
         "nodes": [{
-            "name": "templates",
-            "text": "Dashboards",
+            "name": "organizations",
+            "text": "CMDB",
             "borderColor": "#000",
-            "href": "#ajax/Settings/DashboardSettings.html",
+            "href": "#ajax/Settings/cmdbList.html",
             "selectable": true,
-            "icon": "fa fa-lg fa-fw fa-files-o"
+            "icon": "fa fa-lg fa-fw fa-database"
         }],
         "borderColor": "#000",
         "selectable": false,
         "href": "javascript:void(0);",
-        "icon": "fa-lg fa-fw fa fa-tachometer"
+        "icon": "fa fa-lg fa-fw fa-database"
     }
 ];
 
diff --git a/client/htmls/private/js/scriptList.js b/client/htmls/private/js/scriptList.js
index 1d189e8e2..c9dd403c0 100644
--- a/client/htmls/private/js/scriptList.js
+++ b/client/htmls/private/js/scriptList.js
@@ -29,7 +29,7 @@ function getOrganizationList() {
         var str = ' <option value="">Select Organization</option>',
         len = data.length;
         for (var i = 0; i < data.length; i++) {
-            str = str + '<option value="' + data[i]._id + '">' + data[i].orgname + '</option>';
+            str = str + '<option value="' + data[i].rowid + '">' + data[i].orgname + '</option>';
         }
         $('#orgName').html(str);
     })
diff --git a/client/htmls/private/js/settingscommon.js b/client/htmls/private/js/settingscommon.js
index e8a3de564..41de6af31 100755
--- a/client/htmls/private/js/settingscommon.js
+++ b/client/htmls/private/js/settingscommon.js
@@ -2422,6 +2422,7 @@ function saveform(formID, operationTypes) {
 	    data1.append('password', password);
 	}*/
 	console.log(orgName);
+	console.log(data1);
 	// alert(serviceURL + "savemasterjsonrownew/" + formID + "/" + fileNames + "/" + orgName );
 	$.ajax({
 		url: serviceURL + "savemasterjsonrownew/" + formID + "/" + fileNames + "/" + orgName,
@@ -2441,6 +2442,7 @@ function saveform(formID, operationTypes) {
 				button.removeAttr("rowid", "");
 				$("#masterssavespinner").detach();
 				button.removeAttr('disabled');
+				$('.nextFormWizard').removeAttr('disabled','disabled');
 			} else {
 				$(".savespinner").hide();
 				button.removeAttr("rowid", "");
diff --git a/seed/mongodump/devops_new/settingwizards.bson b/seed/mongodump/devops_new/settingwizards.bson
index 8984f90df..b932fa035 100644
Binary files a/seed/mongodump/devops_new/settingwizards.bson and b/seed/mongodump/devops_new/settingwizards.bson differ
diff --git a/server/app/model/d4dmasters/d4dmastersmodelnew.js b/server/app/model/d4dmasters/d4dmastersmodelnew.js
index de854ccaa..17e624703 100755
--- a/server/app/model/d4dmasters/d4dmastersmodelnew.js
+++ b/server/app/model/d4dmasters/d4dmastersmodelnew.js
@@ -524,6 +524,17 @@ var d4dMastersDockerConfig = new mongoose.Schema({
         type: [String],
         trim: true
     },
+    projectname: {
+        type: String,
+        required: false,
+        trim: true
+    },
+    projectname_rowid: {
+        type: String,
+        required: false,
+        trim: true
+    },
+    repositories:Schema.Types.Mixed,
     folderpath: {
         type: String,
         trim: true
@@ -1255,6 +1266,17 @@ var d4dMastersNexusServer = new mongoose.Schema({
         type: [String],
         trim: true
     },
+    projectname: {
+        type: String,
+        required: false,
+        trim: true
+    },
+    projectname_rowid: {
+        type: String,
+        required: false,
+        trim: true
+    },
+    repositories:Schema.Types.Mixed,
     orgrowid: {
         type: String,
         trim: true
diff --git a/server/app/routes/v1.0/routes_d4dMasters.js b/server/app/routes/v1.0/routes_d4dMasters.js
index 41b17c8fd..167179c1e 100755
--- a/server/app/routes/v1.0/routes_d4dMasters.js
+++ b/server/app/routes/v1.0/routes_d4dMasters.js
@@ -417,7 +417,7 @@ module.exports.setRoutes = function(app, sessionVerification) {
                                         if (dbtype) {
                                             var item = '\"' + req.params.fieldname + '\"';
                                             logger.debug("About to delete Master Type: %s : % : %", dbtype, item, req.params.fieldvalue);
-                                            if(req.params.id === '4') {
+                                            if(req.params.id === '3') {
                                                 masterUtil.getEnvironmentByEnvId(req.params.fieldvalue, function (err, environment) {
                                                     if (err) {
                                                         logger.debug("Hit an errror to get Environment Name : %s", err);
@@ -465,6 +465,7 @@ 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);
@@ -479,7 +480,10 @@ module.exports.setRoutes = function(app, sessionVerification) {
                                                                 return;
                                                             } else {
                                                                 var orgId ='';
-                                                                if(data.orgname_rowid.length ===1){
+                                                                if(req.params.id === '1'){
+                                                                    orgId = data.rowid;
+
+                                                                }else if(data.orgname_rowid.length ===1){
                                                                     orgId = data.orgname_rowid[0];
                                                                 }else{
                                                                     orgId = data.orgname_rowid;
@@ -1767,8 +1771,111 @@ module.exports.setRoutes = function(app, sessionVerification) {
         });
     };
 
-
-
+    function updateProjectWithServer(key, bodyJson) {
+        if (key === 'nexus') {
+            var projectList  = bodyJson['projectname_rowid'].split(',');
+            if(projectList.length > 0) {
+                for(var i = 0;i<projectList.length;i++){
+                    (function(projectId){
+                        d4dModelNew.d4dModelMastersProjects.findOne({
+                            id: "4",
+                            rowid: projectId
+                        }, function (err, project) {
+                            if (err) {
+                                logger.debug("Failed to fetch Project.", err);
+                            } else if (project) {
+                                var newNexusRepo = [];
+                                if (project.repositories.nexus && project.repositories.nexus.length > 0) {
+                                    newNexusRepo = project.repositories.nexus;
+                                    for (var i = 0; i < bodyJson['repositories'].nexus; i++) {
+                                        if (project.repositories.nexus.indexOf(bodyJson['repositories'].nexus[i]) === -1) {
+                                            newNexusRepo.push(bodyJson['repositories'].nexus[i]);
+                                        }
+                                    }
+                                    newNexusRepo.push(bodyJson['repositories'].nexus);
+                                } else {
+                                    newNexusRepo = bodyJson['repositories'].nexus;
+                                }
+                                d4dModelNew.d4dModelMastersProjects.update({
+                                    rowid: projectId,
+                                    id: '4'
+                                }, {
+                                    $set: {
+                                        'repositories.nexus': newNexusRepo
+                                    }
+                                }, {
+                                    upsert: false
+                                }, function (err, data1) {
+                                    if (err) {
+                                        logger.debug('Err while updating d4dModelMastersProjects' + err);
+                                        return;
+                                    }
+                                    logger.debug('Updated project ' + project.projectname);
+                                    return;
+                                });
+                            } else {
+                                return;
+                            }
+                        });
+                    })(projectList[i]);
+                }
+            }else{
+                return;
+            }
+        }else if(key === 'docker'){
+            var projectList  = bodyJson['projectname_rowid'].split(',');
+            if(projectList.length > 0) {
+                for(var i = 0;i<projectList.length;i++){
+                    (function(projectId){
+                        d4dModelNew.d4dModelMastersProjects.findOne({
+                            id: "4",
+                            rowid: projectId
+                        }, function (err, project) {
+                            if (err) {
+                                logger.debug("Failed to fetch Project.", err);
+                            } else if (project) {
+                                var newDockerRepo = [];
+                                if (project.repositories.docker && project.repositories.docker.length > 0) {
+                                    newDockerRepo = project.repositories.docker;
+                                    for (var i = 0; i < bodyJson['repositories'].docker; i++) {
+                                        if (project.repositories.docker.indexOf(bodyJson['repositories'].docker[i]) === -1) {
+                                            newDockerRepo.push(bodyJson['repositories'].docker[i]);
+                                        }
+                                    }
+                                    newDockerRepo.push(bodyJson['repositories'].docker);
+                                } else {
+                                    newDockerRepo = bodyJson['repositories'].docker;
+                                }
+                                d4dModelNew.d4dModelMastersProjects.update({
+                                    rowid: projectId,
+                                    id: '4'
+                                }, {
+                                    $set: {
+                                        'repositories.docker': newDockerRepo
+                                    }
+                                }, {
+                                    upsert: false
+                                }, function (err, data1) {
+                                    if (err) {
+                                        logger.debug('Err while updating d4dModelMastersProjects' + err);
+                                        return;
+                                    }
+                                    logger.debug('Updated project ' + project.projectname);
+                                    return;
+                                });
+                            } else {
+                                return;
+                            }
+                        });
+                    })(projectList[i]);
+                }
+            }else{
+                return;
+            }
+        }else{
+            return;
+        }
+    }
     function findDeselectedItem(CurrentArray, PreviousArray) {
         var CurrentArrSize = CurrentArray.length;
         var PreviousArrSize = PreviousArray.length;
@@ -2232,6 +2339,9 @@ module.exports.setRoutes = function(app, sessionVerification) {
 
     app.post('/d4dMasters/savemasterjsonrownew/:id/:fileinputs/:orgname', function(req, res) {
         logger.debug("Enter post() for /d4dMasters/savemasterjsonrownew/%s/%s/%s", req.params.id, req.params.fileinputs, req.params.orgname);
+        console.log("***********************");
+        console.log(JSON.stringify(req.body));
+        console.log("***********************");
         var bodyJson = JSON.parse(JSON.stringify(req.body));
         //pushing the rowid field
         var editMode = false; //to identify if in edit mode.
@@ -2442,7 +2552,7 @@ module.exports.setRoutes = function(app, sessionVerification) {
                                                         })(x1);
                                                     }
                                                 },
-                                                team:function(callback){
+                                             /*   team:function(callback){
                                                     for (var x = 0; x < 4; x++) {
                                                         (function(x) {
                                                             var teamName;
@@ -2488,7 +2598,7 @@ module.exports.setRoutes = function(app, sessionVerification) {
                                                         })(x);
 
                                                     }
-                                                },
+                                                },*/
                                                 wizard:function(callback){
                                                     var settingWizardSteps = appConfig.settingWizardSteps;
                                                     var currentStep=settingWizardSteps[1];
@@ -2579,7 +2689,7 @@ module.exports.setRoutes = function(app, sessionVerification) {
                                         });
 
                                     } else if (req.params.id === '4') {
-                                        bodyJson['repositories'] = JSON.parse(bodyJson['repositories']);
+                                       // bodyJson['repositories'] = JSON.parse(bodyJson['repositories']);
                                         var projectModel = new d4dModelNew.d4dModelMastersProjects(bodyJson);
                                         projectModel.save(function(err, data) {
                                             if (err) {
@@ -2617,6 +2727,7 @@ module.exports.setRoutes = function(app, sessionVerification) {
                                         });
                                     } else if (req.params.id === '26') {
                                         bodyJson['groupid'] = JSON.parse(bodyJson['groupid']);
+                                        bodyJson['repositories'] = JSON.parse(bodyJson['repositories']);
                                         var nexusModel = new d4dModelNew.d4dModelMastersNexusServer(bodyJson);
                                         nexusModel.save(function(err, data) {
                                             if (err) {
@@ -2638,10 +2749,46 @@ module.exports.setRoutes = function(app, sessionVerification) {
                                                             res.send(500);
                                                             return;
                                                         }
+                                                        updateProjectWithServer('nexus',bodyJson);
                                                         res.send(200);
                                                         return;
                                                     });
                                                 }else{
+                                                    updateProjectWithServer('nexus',bodyJson);
+                                                    res.send(200);
+                                                    return;
+                                                }
+                                            })
+                                        });
+                                    } else if(req.params.id === '18'){
+                                        bodyJson['repositories'] = JSON.parse(bodyJson['repositories']);
+                                        var dockerModel = new d4dModelNew.d4dModelMastersDockerConfig(bodyJson);
+                                        dockerModel.save(function(err, data) {
+                                            if (err) {
+                                                logger.error('Hit Save error', err);
+                                                res.send(500);
+                                                return;
+                                            }
+                                            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 === 'Devops Roles') {
+                                                    settingWizards.currentStep.nestedSteps[1].isCompleted = true;
+                                                    settingWizard.updateSettingWizard(settingWizards, function (err, data) {
+                                                        if (err) {
+                                                            logger.error('Hit getting setting wizard error', err);
+                                                            res.send(500);
+                                                            return;
+                                                        }
+                                                        updateProjectWithServer('docker',bodyJson);
+                                                        res.send(200);
+                                                        return;
+                                                    });
+                                                }else{
+                                                    updateProjectWithServer('docker',bodyJson);
                                                     res.send(200);
                                                     return;
                                                 }
@@ -2658,6 +2805,30 @@ module.exports.setRoutes = function(app, sessionVerification) {
                                             }
                                             logger.debug('New Master Saved');
                                             logger.debug(req.params.fileinputs == 'null');
+                                            if(req.params.id === '21'){
+                                                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 === '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];
+                                                        settingWizard.updateSettingWizard(settingWizards, function (err, data) {
+                                                            if (err) {
+                                                                logger.error('Hit getting setting wizard error', err);
+                                                                res.send(500);
+                                                                return;
+                                                            }
+                                                        });
+                                                    }
+                                                })
+                                            }
                                             if(req.params.id === '2'){
                                                 settingWizard.getSettingWizardByOrgId(bodyJson['orgname_rowid'],function(err,settingWizards){
                                                     if(err){
@@ -2696,14 +2867,14 @@ module.exports.setRoutes = function(app, sessionVerification) {
                                                     }
                                                 })
                                             }
-                                            if(req.params.id === '18'){
+                                            if(req.params.id === '19'){
                                                 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 === 'Devops Roles') {
+                                                    if(settingWizards.currentStep.name === 'Gallery Setup') {
                                                         settingWizards.currentStep.nestedSteps[1].isCompleted = true;
                                                         settingWizard.updateSettingWizard(settingWizards, function (err, data) {
                                                             if (err) {
@@ -2728,7 +2899,7 @@ module.exports.setRoutes = function(app, sessionVerification) {
                                                         settingWizards.currentStep.isCompleted = true;
                                                         settingWizards.previousStep = settingWizards.currentStep;
                                                         settingWizards.currentStep = settingWizards.nextStep;
-                                                        settingWizards.nextStep = settingWizardSteps[7];
+                                                        settingWizards.nextStep = {wizardStatus:'true'};
                                                         settingWizard.updateSettingWizard(settingWizards, function (err, data) {
                                                             if (err) {
                                                                 logger.error('Hit getting setting wizard error', err);
@@ -2766,12 +2937,7 @@ 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);
@@ -2818,9 +2984,9 @@ module.exports.setRoutes = function(app, sessionVerification) {
 
                                     // Update settings
                                     if (req.params.id === '4') {
-                                        bodyJson['repositories'] = JSON.parse(bodyJson['repositories']);
+                                       // bodyJson['repositories'] = JSON.parse(bodyJson['repositories']);
                                         delete rowtoedit._id; //fixing the issue of
-                                        rowtoedit["repositories"] = bodyJson['repositories'];
+                                      //  rowtoedit["repositories"] = bodyJson['repositories'];
                                         logger.debug('Rowtoedit: %s', JSON.stringify(rowtoedit));
                                         eval('d4dModelNew.' + dbtype).update({
                                             rowid: bodyJson["rowid"],
diff --git a/server/app/routes/v1.0/routes_nexus.js b/server/app/routes/v1.0/routes_nexus.js
index 3c7dc4605..7ce9b4428 100755
--- a/server/app/routes/v1.0/routes_nexus.js
+++ b/server/app/routes/v1.0/routes_nexus.js
@@ -19,6 +19,8 @@ limitations under the License.
 
 var nexus = require('_pr/lib/nexus.js');
 var logger = require('_pr/logger')(module);
+var Client = require('node-rest-client').Client;
+var parser = require('xml2json');
 
 module.exports.setRoutes = function(app, verificationFunc) {
     app.all('/nexus/*', verificationFunc);
@@ -74,6 +76,38 @@ module.exports.setRoutes = function(app, verificationFunc) {
     	});
     });
 
+	app.get('/nexus/userName/:userName/nexusPassword/:nexusPassword/repositories',function(req,res){
+		logger.debug("Called nexus repositories..");
+		if(!req.params.userName){
+			res.status(500).send("Nexus User Name can't be empty.");
+		}
+		if(!req.params.nexusPassword){
+			res.status(500).send("Nexus Password can't be empty.");
+		}
+		if(!req.query.hostName){
+			res.status(500).send("Nexus Host Name can't be empty.");
+		}
+		var options_auth = {
+			user: req.params.userName,
+			password: req.params.nexusPassword
+		};
+		client = new Client(options_auth);
+		var nexusUrl = req.query.hostName + '/service/local/repositories';
+		client.registerMethod("jsonMethod", nexusUrl, "GET");
+		var reqSubmit = client.methods.jsonMethod(function(data, response) {
+			try {
+				var json = parser.toJson(data);
+				logger.debug("data: ", JSON.stringify(json));
+				json = JSON.parse(json);
+				res.send(json.repositories.data['repositories-item']);
+			} catch (err) {
+				logger.debug("Error while fetching nexus repositories.");
+				res.status(500).send("Error while fetching nexus repositories.");
+				return;
+			}
+		});
+	});
+
     app.get('/nexus/:anId/repositories/:repoName/group/:groupId/artifact',function(req,res){
     	logger.debug("Called nexus repositories..");
     	if(!req.params.anId){
diff --git a/server/app/routes/v1.0/routes_scripts.js b/server/app/routes/v1.0/routes_scripts.js
index 7952cec4a..6c51c28b2 100644
--- a/server/app/routes/v1.0/routes_scripts.js
+++ b/server/app/routes/v1.0/routes_scripts.js
@@ -63,7 +63,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                 res.send(errorResponses.db.error);
                 return;
             } else {
-                settingWizard.getSettingWizardByOrgId(orgId,function(err,settingWizards){
+                settingWizard.getSettingWizardByOrgId(req.body.orgDetails.id,function(err,settingWizards){
                     if(err){
                         logger.error('Hit getting setting wizard error', err);
                         res.send(500);
@@ -113,35 +113,32 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
 
     app.delete('/scripts/:scriptId',validate(scriptValidator.get), function(req, res) {
         scriptService.getScriptById(req.params.scriptId, function(err, scripts) {
+            logger.debug(JSON.stringify(scripts));
             if (err) {
                 res.status(500).send(errorResponses.db.error);
                 return;
-            }else if (scripts.length > 0) {
-                scriptService.removeScriptById(req.params.scriptId, function (err, script) {
-                    if (err) {
-                        if (err.code === 403) {
-                            res.send(err.code, err.message);
-                            return;
-                        } else {
-                            res.send("Error while removing script:");
-                            return;
-                        }
+            }
+            scriptService.removeScriptById(req.params.scriptId, function (err, script) {
+                if (err) {
+                    if (err.code === 403) {
+                        res.send(err.code, err.message);
+                        return;
                     } else {
-                        settingsService.trackSettingWizard('scriptGallery', script.orgDetails.id, function (err, data) {
-                            if (err) {
-                                logger.error("Failed to update setting wizard item (%s)", err);
-                                res.status(500).send(err);
-                                return;
-                            }
-                            res.send("Successfully Removed script From the Database");
-                            return;
-                        })
+                        res.send("Error while removing script:");
+                        return;
                     }
-                });
-            }else {
-                res.send("Script not found!");
-                return;
-            }
+                } else {
+                    settingsService.trackSettingWizard('scriptGallery', scripts.orgDetails.id, function (err, data) {
+                        if (err) {
+                             logger.error("Failed to update setting wizard item (%s)", err);
+                             res.status(500).send(err);
+                             return;
+                        }
+                        res.send("Successfully Removed script From the Database");
+                        return;
+                    })
+                }
+            });
         });
     });
 };
diff --git a/server/app/routes/v1.0/routes_servicenow.js b/server/app/routes/v1.0/routes_servicenow.js
index e6e6024fc..c7ba973a1 100755
--- a/server/app/routes/v1.0/routes_servicenow.js
+++ b/server/app/routes/v1.0/routes_servicenow.js
@@ -461,30 +461,9 @@ module.exports.setRoutes = function(app, verificationFunc) {
                 res.status(500).send("Failed to save Org.");
                 return;
             }
-            settingWizard.getSettingWizardByOrgId(req.body.orgname_rowid,function(err,settingWizards){
-                if(err){
-                    logger.error('Hit getting setting wizard error', err);
-                    res.send(500);
-                    return;
-                }
-                if(settingWizards.currentStep.name === 'Gallery Setup') {
-                    settingWizards.currentStep.nestedSteps[1].isCompleted = true;
-                    settingWizard.updateSettingWizard(settingWizards, function (err, data) {
-                        if (err) {
-                            logger.error('Hit updating setting wizard error', err);
-                            res.send(500);
-                            return;
-                        }
-                        logger.debug("save response:" + data);
-                        res.send(data);
-                        return;
-                    });
-                }else{
-                    logger.debug("save response:" + data);
-                    res.send(data);
-                    return;
-                }
-            })
+            logger.debug("save response:" + data);
+            res.send(data);
+            return;
         });
     });
 
@@ -555,30 +534,15 @@ module.exports.setRoutes = function(app, verificationFunc) {
     });
 
     app.delete('/servicenow/removeItem/id/:id', function(req, res) {
-        logger.debug("Deleting servicenow item");
-        CMDBConfig.getCMDBServerById(req.params.id, function(err, data) {
-            if (err) {
-                logger.error("Error", err);
-                res.send(err);
-                return;
-            }
-            CMDBConfig.removeServerById(req.params.id, function (err, servicedata) {
-                if (err) {
-                    logger.error("Failed to remove item (%s)", err);
-                    res.status(500).send(err);
-                    return;
-                }
-                settingsService.trackSettingWizard('serviceNow',data.orgname_rowid,function(err,settingdata){
-                    if (err) {
-                        logger.error("Failed to update setting wizard item (%s)", err);
-                        res.status(500).send(err);
-                        return;
-                    }
-                    logger.debug("Exit removeInstancebyId (%s)", req.params.id);
-                    res.send(servicedata);
-                })
-            });
-        });
-    });
-
+       logger.debug("Deleting servicenow item");
+       CMDBConfig.removeServerById(req.params.id, function (err, servicedata) {
+        if (err) {
+               logger.error("Failed to remove item (%s)", err);
+               res.status(500).send(err);
+               return;
+        }
+        logger.debug("Exit removeInstancebyId (%s)", req.params.id);
+        res.send(servicedata);
+     });
+   });
 }
diff --git a/server/app/services/settingsService.js b/server/app/services/settingsService.js
index aa078f6cc..9ca34e793 100644
--- a/server/app/services/settingsService.js
+++ b/server/app/services/settingsService.js
@@ -95,8 +95,9 @@ settingsService.trackSettingWizard = function trackSettingWizard(id,orgId,callba
                callback(err, null);
                return;
            }
+           logger.debug(JSON.stringify(settingWizards));
            if (settingWizards.currentStep.name === 'Org Configuration'
-               && settingWizards.currentStep.nestedSteps[1] === true) {
+               && settingWizards.currentStep.nestedSteps[1].isCompleted === true) {
                settingWizards.currentStep.nestedSteps[1].isCompleted = false;
                settingWizards.currentStep.nestedSteps[2].isCompleted = false;
                settingWizard.updateSettingWizard(settingWizards, function (err, data) {
@@ -121,6 +122,7 @@ settingsService.trackSettingWizard = function trackSettingWizard(id,orgId,callba
                var settingWizardSteps = appConfig.settingWizardSteps;
                settingWizards.currentStep = settingWizards.previousStep;
                settingWizards.currentStep.nestedSteps[2].isCompleted = false;
+               settingWizards.currentStep.isCompleted = false;
                settingWizards.previousStep = settingWizardSteps[0];
                settingWizards.nextStep = settingWizardSteps[2];
                settingWizard.updateSettingWizard(settingWizards, function (err, data) {
@@ -162,18 +164,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;
+           if (settingWizards.currentStep.name === 'Config Management'
+               && settingWizards.currentStep.nestedSteps[1].isCompleted === true) {
                settingWizards.currentStep.nestedSteps[1].isCompleted = false;
-               settingWizards.previousStep = previousStep;
-               settingWizards.nextStep = settingWizardSteps[3];
+               settingWizards.currentStep.isCompleted = false;
                settingWizard.updateSettingWizard(settingWizards, function (err, data) {
                    if (err) {
                        callback(err,null);
@@ -186,7 +180,38 @@ settingsService.trackSettingWizard = function trackSettingWizard(id,orgId,callba
                return;
            }
        })
-   }else if(id === '26'){
+   }else if(id === '21'){
+        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[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;
+                settingWizards.currentStep.isCompleted = false;
+                settingWizards.previousStep = previousStep;
+                settingWizards.nextStep = settingWizardSteps[3];
+                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);
@@ -238,7 +263,7 @@ settingsService.trackSettingWizard = function trackSettingWizard(id,orgId,callba
                callback(err, null);
                return;
            }
-           if (settingWizards.currentStep.name === 'Track'
+           if (settingWizards.currentStep.name === 'CMDB Configuration'
                && settingWizards.currentStep.isCompleted === false) {
                var settingWizardSteps = appConfig.settingWizardSteps;
                var previousStep = settingWizardSteps[4];
@@ -248,6 +273,7 @@ settingsService.trackSettingWizard = function trackSettingWizard(id,orgId,callba
                previousStep.isCompleted = true;
                settingWizards.currentStep = settingWizards.previousStep;
                settingWizards.currentStep.nestedSteps[2].isCompleted = false;
+               settingWizards.currentStep.isCompleted = false;
                settingWizards.previousStep = previousStep;
                settingWizards.nextStep = settingWizardSteps[6];
                settingWizard.updateSettingWizard(settingWizards, function (err, data) {
@@ -283,16 +309,15 @@ settingsService.trackSettingWizard = function trackSettingWizard(id,orgId,callba
                return;
            }
        })
-   }else if(id === 'provider'){
+   }else if(id === '19'){
        settingWizard.getSettingWizardByOrgId(orgId,function(err,settingWizards) {
            if (err) {
                callback(err, null);
                return;
            }
-           if (settingWizards.currentStep.name === 'Provider Configuration'
-               && settingWizards.currentStep.nestedSteps[1].isCompleted === false) {
-               settingWizards.currentStep.nestedSteps[0].isCompleted = false;
-               settingWizards.currentStep.nestedSteps[1].isCompleted = false;
+           if (settingWizards.currentStep.name === 'Gallery Setup'
+               && settingWizards.nestedSteps[1].isCompleted === true) {
+               settingWizards.nestedSteps[1].isCompleted = false;
                settingWizard.updateSettingWizard(settingWizards, function (err, data) {
                    if (err) {
                        callback(err,null);
@@ -305,23 +330,16 @@ settingsService.trackSettingWizard = function trackSettingWizard(id,orgId,callba
                return;
            }
        })
-   }else if(id === 'vmImage'){
+   }else if(id === 'provider'){
        settingWizard.getSettingWizardByOrgId(orgId,function(err,settingWizards) {
            if (err) {
                callback(err, null);
                return;
            }
-           if (settingWizards.currentStep.name === 'Devops Roles'
-               && 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;
+           if (settingWizards.currentStep.name === 'Provider Configuration'
+               && settingWizards.currentStep.nestedSteps[1].isCompleted === false) {
+               settingWizards.currentStep.nestedSteps[0].isCompleted = false;
                settingWizards.currentStep.nestedSteps[1].isCompleted = false;
-               settingWizards.previousStep = previousStep;
-               settingWizards.nextStep = settingWizardSteps[5];
                settingWizard.updateSettingWizard(settingWizards, function (err, data) {
                    if (err) {
                        callback(err,null);
@@ -334,21 +352,30 @@ settingsService.trackSettingWizard = function trackSettingWizard(id,orgId,callba
                return;
            }
        })
-   }else if(id === 'serviceNow'){
+   }else if(id === 'vmImage'){
        settingWizard.getSettingWizardByOrgId(orgId,function(err,settingWizards) {
            if (err) {
                callback(err, null);
                return;
            }
-           if (settingWizards.currentStep.name === 'Gallery Setup' && settingWizards.currentStep.nestedSteps[2].isCompleted === false) {
+           if (settingWizards.currentStep.name === 'Gallery Setup'
+               && 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[5];
                settingWizard.updateSettingWizard(settingWizards, function (err, data) {
                    if (err) {
                        callback(err,null);
                        return;
                    }
                    callback(null,data);
-                   return;
                });
            }else{
                callback(null,settingWizards);
@@ -363,12 +390,13 @@ 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[2];
+               var previousStep = settingWizardSteps[3];
                previousStep.nestedSteps[0].isCompleted = true;
                previousStep.nestedSteps[1].isCompleted = true;
                previousStep.isCompleted = true;
                settingWizards.currentStep = settingWizards.previousStep;
                settingWizards.currentStep.nestedSteps[2].isCompleted = false;
+               settingWizards.currentStep.isCompleted = false;
                settingWizards.previousStep = previousStep;
                settingWizards.nextStep = settingWizardSteps[6];
                settingWizard.updateSettingWizard(settingWizards, function (err, data) {
@@ -384,6 +412,9 @@ settingsService.trackSettingWizard = function trackSettingWizard(id,orgId,callba
                return;
            }
        })
+   }else{
+    callback(null,null);
+    return;
    }
 };
 
diff --git a/server/install.js b/server/install.js
index fdde2bf3e..f9b5c62f2 100755
--- a/server/install.js
+++ b/server/install.js
@@ -68,13 +68,12 @@ function getDefaultsConfig() {
             }
         },
         settingWizardSteps:[{name :'Introduction',isCompleted:true},
-            {name :'Org Configuration',isCompleted:false,mandatoryCheck:true,nestedSteps:[{name:'Organization',isCompleted:false},
-                {name :'BusinessGroup',isCompleted:false},{name:'Project',isCompleted:false}]},
-            {name :'Config Management',isCompleted:false,mandatoryCheck:true,nestedSteps:[{name:'ChefServer',isCompleted:false},{name:'Environment',isCompleted:false}]},
-            {name :'Provider Configuration',isCompleted:false,mandatoryCheck:true,nestedSteps:[{name:'Provider',isCompleted:false},{name:'VMImage',isCompleted:false}]},
-            {name :'Gallery Setup',isCompleted:false,mandatoryCheck:true,nestedSteps:[{name:'Templates',isCompleted:false},{name:'ServiceCommand',isCompleted:false},{name:'ScriptGallery',isCompleted:false}]},
-            {name :'Devops Roles',isCompleted:false,mandatoryCheck:false,nestedSteps:[{name:'Nexus',isCompleted:false},{name:'Docker',isCompleted:false},{name:'Jenkins',isCompleted:false}]},
-            {name :'Track',isCompleted:false,mandatoryCheck:false},
+            {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 :'Provider Configuration',isCompleted:false,mandatoryCheck:true,nestedSteps:[{name:'Provider',isCompleted:false,mandatoryCheck:true},{name:'VMImage',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}
         ],
         serviceControllerKey:'ZDQ2YWM3ZTUyZDhhZjhhOWRkMWQ2ZTc3NDhhNjk1OWEyYzgxZGJkMWVjYjA3ZThiZjY0NTBjYjBjMTM5YzA0Yg',