diff --git a/awx/ui/client/src/app.js b/awx/ui/client/src/app.js
index 012928f590..7d3f3d302e 100644
--- a/awx/ui/client/src/app.js
+++ b/awx/ui/client/src/app.js
@@ -19,8 +19,8 @@ import uiRouter from 'angular-ui-router';
 // backwards compatibility for $stateChange* events
 import 'angular-ui-router/release/stateEvents';
 // ui-router debugging
-import { trace } from 'angular-ui-router';
-trace.enable();
+//import { trace } from 'angular-ui-router';
+//trace.enable();
 
 // Configuration dependencies
 global.$AnsibleConfig = null;
diff --git a/awx/ui/client/src/forms/WorkflowMaker.js b/awx/ui/client/src/forms/WorkflowMaker.js
index a9992342c6..e243818639 100644
--- a/awx/ui/client/src/forms/WorkflowMaker.js
+++ b/awx/ui/client/src/forms/WorkflowMaker.js
@@ -58,10 +58,10 @@ export default
                     dataTitle: 'Inventory',
                     dataPlacement: 'right',
                     dataContainer: "body",
-                    //ngShow: "selectedTemplate.ask_inventory_on_launch",
-                    // awRequiredWhen: {
-                    //     reqExpression: 'selectedTemplate.ask_inventory_on_launch'
-                    // }
+                    ngShow: "selectedTemplate.ask_inventory_on_launch",
+                    awRequiredWhen: {
+                        reqExpression: 'selectedTemplate.ask_inventory_on_launch'
+                    }
                 },
                 job_type: {
                     label: 'Job Type',
diff --git a/awx/ui/client/src/job-templates/main.js b/awx/ui/client/src/job-templates/main.js
index f22f573236..f9c16d757b 100644
--- a/awx/ui/client/src/job-templates/main.js
+++ b/awx/ui/client/src/job-templates/main.js
@@ -110,10 +110,12 @@ angular.module('jobTemplates', [surveyMaker.name, jobTemplatesList.name, jobTemp
                                 delete list.fields.description;
                                 delete list.fields.smart_status;
                                 delete list.fields.labels;
+                                delete list.fieldActions;
                                 list.fields.name.columnClass = "col-md-11";
                                 let html = generateList.build({
                                     list: list,
-                                    mode: 'edit'
+                                    input_type: 'radio',
+                                    mode: 'lookup'
                                 });
                                 return html;
                             },
@@ -133,7 +135,8 @@ angular.module('jobTemplates', [surveyMaker.name, jobTemplatesList.name, jobTemp
                                 // mutate list definition here!
                                 let html = generateList.build({
                                     list: list,
-                                    mode: 'edit'
+                                    input_type: 'radio',
+                                    mode: 'lookup'
                                 });
                                 return html;
                             },
@@ -147,7 +150,7 @@ angular.module('jobTemplates', [surveyMaker.name, jobTemplatesList.name, jobTemp
                                 }
                             ]
                         },
-                        'projectList@templates.editWorkflowJobTemplate.workflowMaker': {
+                        'projectSyncList@templates.editWorkflowJobTemplate.workflowMaker': {
                             templateProvider: function(ProjectList, generateList) {
                                 let list = _.cloneDeep(ProjectList);
                                 delete list.fields.status;
@@ -156,7 +159,8 @@ angular.module('jobTemplates', [surveyMaker.name, jobTemplatesList.name, jobTemp
                                 list.fields.name.columnClass = "col-md-11";
                                 let html = generateList.build({
                                     list: list,
-                                    mode: 'edit'
+                                    input_type: 'radio',
+                                    mode: 'lookup'
                                 });
                                 return html;
                             },
@@ -175,6 +179,7 @@ angular.module('jobTemplates', [surveyMaker.name, jobTemplatesList.name, jobTemp
                                 let html = GenerateForm.buildHTML(form, {
                                     mode: 'add',
                                     related: false,
+                                    noPanel: true
                                 });
                                 return html;
                             }
diff --git a/awx/ui/client/src/job-templates/workflow-maker/workflow-maker.controller.js b/awx/ui/client/src/job-templates/workflow-maker/workflow-maker.controller.js
index 64fe177df1..bcc721b738 100644
--- a/awx/ui/client/src/job-templates/workflow-maker/workflow-maker.controller.js
+++ b/awx/ui/client/src/job-templates/workflow-maker/workflow-maker.controller.js
@@ -13,8 +13,7 @@ export default ['$scope', 'WorkflowHelpService', 'generateList', 'JobTemplateLis
         ProcessErrors, InventorySourcesList, CreateSelect2, WorkflowMakerForm,
         GenerateForm, InventoryList, CredentialList, $q, $timeout) {
 
-        let form = WorkflowMakerForm(),
-            generator = GenerateForm;
+        let form = WorkflowMakerForm();
 
         $scope.workflowMakerFormConfig = {
             nodeMode: "idle",
@@ -143,9 +142,7 @@ export default ['$scope', 'WorkflowHelpService', 'generateList', 'JobTemplateLis
 
         }
 
-
         $scope.lookUpInventory = function(){
-            console.log($state)
             $state.go('.inventory')
         };
 
diff --git a/awx/ui/client/src/job-templates/workflow-maker/workflow-maker.directive.js b/awx/ui/client/src/job-templates/workflow-maker/workflow-maker.directive.js
index aacb606fdd..e2d81c01ca 100644
--- a/awx/ui/client/src/job-templates/workflow-maker/workflow-maker.directive.js
+++ b/awx/ui/client/src/job-templates/workflow-maker/workflow-maker.directive.js
@@ -45,6 +45,8 @@ export default ['templateUrl', 'CreateDialog', 'Wait',
                 }
                 scope.removeWorkflowDialogReady = scope.$on('WorkflowDialogReady', function() {
                     $('#workflow-modal-dialog').dialog('open');
+
+                    scope.$broadcast("refreshWorkflowChart");
                 });
             }
         };
diff --git a/awx/ui/client/src/job-templates/workflow-maker/workflow-maker.partial.html b/awx/ui/client/src/job-templates/workflow-maker/workflow-maker.partial.html
index 2b36654125..c611477ed0 100644
--- a/awx/ui/client/src/job-templates/workflow-maker/workflow-maker.partial.html
+++ b/awx/ui/client/src/job-templates/workflow-maker/workflow-maker.partial.html
@@ -60,21 +60,19 @@
                     <span class="badge List-titleBadge" ng-bind="treeData.data.totalNodes"></span>
                 </div>
             </div>
-            <!--
             <workflow-chart tree-data="treeData.data" add-node="startAddNode(parent, betweenTwoNodes)" edit-node="startEditNode(nodeToEdit)" delete-node="startDeleteNode(nodeToDelete)" class="WorkflowMaker-chart"></workflow-chart>
-            -->
         </div>
         <div class="WorkflowMaker-contentRight">
             <div class="WorkflowMaker-formTitle">{{(workflowMakerFormConfig.nodeMode === 'edit' && nodeBeingEdited && nodeBeingEdited.unifiedJobTemplate && nodeBeingEdited.unifiedJobTemplate.name) ? nodeBeingEdited.unifiedJobTemplate.name : "ADD A TEMPLATE"}}</div>
             <div class="WorkflowMaker-formHelp" ng-show="workflowMakerFormConfig.nodeMode === 'idle'">Please hover over a template and click the Add button.</div>
-            <div class="WorkflowMaker-form" > <!-- ng-show="workflowMakerFormConfig.nodeMode === 'add' || workflowMakerFormConfig.nodeMode === 'edit'" -->
+            <div class="WorkflowMaker-form" ng-show="workflowMakerFormConfig.nodeMode === 'add' || workflowMakerFormConfig.nodeMode === 'edit'">
                 <div class="Form-tabHolder">
                     <div class="Form-tab" ng-class="{'is-selected': workflowMakerFormConfig.activeTab === 'jobs'}" ng-click="toggleFormTab('jobs')">JOBS</div>
                     <div class="Form-tab" ng-class="{'is-selected': workflowMakerFormConfig.activeTab === 'project_sync'}" ng-click="toggleFormTab('project_sync')">PROJECT SYNC</div>
                     <div class="Form-tab" ng-class="{'is-selected': workflowMakerFormConfig.activeTab === 'inventory_sync'}" ng-click="toggleFormTab('inventory_sync')">INVENTORY SYNC</div>
                 </div>
                 <div class="WorkflowMaker-formLists">
-                    <div id="workflow-jobs-list"  ui-view="jobTemplateList"></div> <!-- ng-show="workflowMakerFormConfig.activeTab === 'jobs'" -->
+                    <div id="workflow-jobs-list"  ui-view="jobTemplateList" ng-show="workflowMakerFormConfig.activeTab === 'jobs'"></div>
                     <div id="workflow-project-sync-list" ng-show="workflowMakerFormConfig.activeTab === 'project_sync'" ui-view="projectSyncList"></div>
                     <div id="workflow-inventory-sync-list" ng-show="workflowMakerFormConfig.activeTab === 'inventory_sync'" ui-view="inventorySyncList"></div>
                 </div>
diff --git a/awx/ui/client/src/lists/JobTemplates.js b/awx/ui/client/src/lists/JobTemplates.js
index d776f2e680..a85c49613b 100644
--- a/awx/ui/client/src/lists/JobTemplates.js
+++ b/awx/ui/client/src/lists/JobTemplates.js
@@ -82,7 +82,7 @@ export default
             submit: {
                 label: i18n._('Launch'),
                 mode: 'all',
-                ngClick: 'submitJob(unified_job_templates)',
+                ngClick: 'submitJob(template)',
                 awToolTip: i18n._('Start a job using this template'),
                 dataPlacement: 'top',
                 ngShow: 'template.summary_fields.user_capabilities.start'
@@ -90,14 +90,14 @@ export default
             schedule: {
                 label: i18n._('Schedule'),
                 mode: 'all',
-                ngClick: 'scheduleJob(unified_job_templates)',
+                ngClick: 'scheduleJob(template)',
                 awToolTip: i18n._('Schedule future job template runs'),
                 dataPlacement: 'top',
                 ngShow: 'template.summary_fields.user_capabilities.schedule'
             },
             copy: {
                 label: i18n._('Copy'),
-                'ui-sref': 'templates.copy({id: unified_job_templates.id})',
+                'ui-sref': 'templates.copy({id: template.id})',
                 "class": 'btn-danger btn-xs',
                 awToolTip: i18n._('Copy template'),
                 dataPlacement: 'top',
@@ -105,7 +105,7 @@ export default
             },
             edit: {
                 label: i18n._('Edit'),
-                ngClick: "editJobTemplate(unified_job_templates)",
+                ngClick: "editJobTemplate(template)",
                 awToolTip: i18n._('Edit template'),
                 "class": 'btn-default btn-xs',
                 dataPlacement: 'top',
@@ -113,7 +113,7 @@ export default
             },
             view: {
                 label: i18n._('View'),
-                ngClick: "editJobTemplate(unified_job_templates.id)",
+                ngClick: "editJobTemplate(template.id)",
                 awToolTip: i18n._('View template'),
                 "class": 'btn-default btn-xs',
                 dataPlacement: 'top',
@@ -121,7 +121,7 @@ export default
             },
             "delete": {
                 label: i18n._('Delete'),
-                ngClick: "deleteJobTemplate(unified_job_templates)",
+                ngClick: "deleteJobTemplate(template)",
                 "class": 'btn-danger btn-xs',
                 awToolTip: i18n._('Delete template'),
                 dataPlacement: 'top',
diff --git a/awx/ui/client/src/shared/form-generator.js b/awx/ui/client/src/shared/form-generator.js
index 9386ef6641..955a5d1e7e 100644
--- a/awx/ui/client/src/shared/form-generator.js
+++ b/awx/ui/client/src/shared/form-generator.js
@@ -164,12 +164,21 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
             // Not a very good way to do this
             // Form sub-states expect to target ui-views related@stateName & modal@stateName
             // Also wraps mess of generated HTML in a .Panel
-            wrapPanel(html){
-                return `<div class="Panel">
-                ${html}
-                <div ui-view="related"></div>
-                <div ui-view="modal"></div>
-                </div>`;
+            wrapPanel(html, ignorePanel){
+                if(ignorePanel) {
+                    return `<div>
+                    ${html}
+                    <div ui-view="related"></div>
+                    <div ui-view="modal"></div>
+                    </div>`;
+                }
+                else {
+                    return `<div class="Panel">
+                    ${html}
+                    <div ui-view="related"></div>
+                    <div ui-view="modal"></div>
+                    </div>`;
+                }
             },
 
             buildHTML: function(form, options) {
@@ -1548,7 +1557,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
                     });
                 }
                // console.log(html)
-                return this.wrapPanel(html);
+                return this.wrapPanel(html, options.noPanel);
             },
 
             buildCollection: function (params) {