diff --git a/awx/ui/client/src/templates/templates.service.js b/awx/ui/client/src/templates/templates.service.js
index 1a63cb6553..bb1edfe661 100644
--- a/awx/ui/client/src/templates/templates.service.js
+++ b/awx/ui/client/src/templates/templates.service.js
@@ -133,10 +133,10 @@ export default ['Rest', 'GetBasePath', '$q', 'NextPage', function(Rest, GetBaseP
       getWorkflowJobTemplateNodes: function(id, page) {
           var url = GetBasePath('workflow_job_templates');
 
-          url = url + id + '/workflow_nodes';
+          url = url + id + '/workflow_nodes?page_size=200';
 
           if(page) {
-              url += '/?page=' + page;
+              url += '/&page=' + page;
           }
 
           Rest.setUrl(url);
diff --git a/awx/ui/client/src/templates/workflows/workflow-chart/workflow-chart.directive.js b/awx/ui/client/src/templates/workflows/workflow-chart/workflow-chart.directive.js
index 18b562982d..c2f969cad3 100644
--- a/awx/ui/client/src/templates/workflows/workflow-chart/workflow-chart.directive.js
+++ b/awx/ui/client/src/templates/workflows/workflow-chart/workflow-chart.directive.js
@@ -832,7 +832,7 @@ export default ['$state','moment', '$timeout', '$window', '$filter', 'Rest', 'Ge
                                                 .attr("height", tipHeight+20)
                                                 .attr("class", "WorkflowChart-tooltip")
                                                 .html(function(){
-                                                    return "<div class='WorkflowChart-tooltipContents'><span>" + $filter('sanitize')(resourceName) + "</span></div><div class='WorkflowChart-tooltipArrow'></div>";
+                                                    return "<div class='WorkflowChart-tooltipContents'><span>" + $filter('sanitize')(resourceName) + "</span></div><div class='WorkflowChart-tooltipArrow--down'></div>";
                                                 });
                                         }
 
diff --git a/awx/ui/client/src/templates/workflows/workflow-maker/forms/workflow-node-form.partial.html b/awx/ui/client/src/templates/workflows/workflow-maker/forms/workflow-node-form.partial.html
index ee64faadb9..0732e14819 100644
--- a/awx/ui/client/src/templates/workflows/workflow-maker/forms/workflow-node-form.partial.html
+++ b/awx/ui/client/src/templates/workflows/workflow-maker/forms/workflow-node-form.partial.html
@@ -7,23 +7,23 @@
     </div>
     <div class="WorkflowMaker-formLists">
         <div id="workflow-jobs-list" ng-show="activeTab === 'jobs'">
-            <div ng-hide="templates.length === 0 && (searchTags | isEmpty)">
-                <smart-search django-model="templates" base-path="unified_job_templates" iterator="template" dataset="template_dataset" list="templateList" collection="templates" default-params="template_default_params" query-set="template_queryset" search-bar-full-width="true" search-tags="searchTags">
+            <div ng-hide="wf_maker_templates.length === 0 && (searchTags | isEmpty)">
+                <smart-search django-model="unified_job_templates" base-path="unified_job_templates" iterator="wf_maker_template" dataset="wf_maker_template_dataset" list="templateList" collection="wf_maker_templates" default-params="wf_maker_template_default_params" query-set="wf_maker_template_queryset" search-bar-full-width="true" search-tags="searchTags">
                 </smart-search>
             </div>
 
-            <div class="row" ng-show="templates.length === 0 && !(searchTags | isEmpty)">
+            <div class="row" ng-show="wf_maker_templates.length === 0 && !(searchTags | isEmpty)">
                 <div class="col-lg-12 List-searchNoResults" translate>No records matched your search.</div>
             </div>
-            <div class="List-noItems" ng-show="templates.length === 0 && (searchTags | isEmpty)">PLEASE ADD ITEMS TO THIS LIST</div>
+            <div class="List-noItems" ng-show="wf_maker_templates.length === 0 && (searchTags | isEmpty)">PLEASE ADD ITEMS TO THIS LIST</div>
             <div class="list-table-container" ng-show="wf_maker_templates.length > 0">
                 <table id="templates_table" class="List-table" is-extended="false">
                     <thead>
                         <tr class="List-tableHeaderRow">
                             <th class="List-tableHeader select-column List-staticColumn--smallStatus" translate=""></th>
-                            <th base-path="unified_job_templates" collection="templates" dataset="template_dataset" column-sort="" column-field="name" column-iterator="template" column-no-sort="undefined" column-label="Name" column-custom-class="" query-set="template_queryset">
+                            <th class="col-md-8" base-path="unified_job_templates" collection="templates" dataset="template_dataset" column-sort="" column-field="name" column-iterator="template" column-no-sort="undefined" column-label="Name" column-custom-class="" query-set="template_queryset">
                             </th>
-                            <th class="List-tableHeader--info" base-path="unified_job_templates" collection="wf_maker_templates" dataset="wf_maker_template_dataset" column-sort="" column-field="info" column-iterator="wf_maker_template" column-no-sort="true" column-label="" column-custom-class="" query-set="wf_maker_template_queryset">
+                            <th class="List-tableHeader--info col-md-3" base-path="unified_job_templates" collection="wf_maker_templates" dataset="wf_maker_template_dataset" column-sort="" column-field="info" column-iterator="wf_maker_template" column-no-sort="true" column-label="" column-custom-class="" query-set="wf_maker_template_queryset">
                             </th>
                         </tr>
                     </thead>
diff --git a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js
index 065c55835c..8b5d40c4e9 100644
--- a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js
+++ b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js
@@ -306,6 +306,10 @@ export default ['$scope', 'TemplatesService',
                 $scope.cancelNodeForm();
             }
 
+            if ($scope.linkConfig) {
+                $scope.cancelLinkForm();
+            }
+
             $scope.graphState.arrayOfNodesForChart.push({
                 index: $scope.graphState.arrayOfNodesForChart.length,
                 id: workflowMakerNodeIdCounter,
@@ -342,6 +346,10 @@ export default ['$scope', 'TemplatesService',
                 $scope.cancelNodeForm();
             }
 
+            if ($scope.linkConfig) {
+                $scope.cancelLinkForm();
+            }
+
             $scope.graphState.arrayOfNodesForChart.push({
                 index: $scope.graphState.arrayOfNodesForChart.length,
                 id: workflowMakerNodeIdCounter,
diff --git a/awx/ui/client/src/workflow-results/workflow-results.controller.js b/awx/ui/client/src/workflow-results/workflow-results.controller.js
index 00328f4f30..ea1ff2d49b 100644
--- a/awx/ui/client/src/workflow-results/workflow-results.controller.js
+++ b/awx/ui/client/src/workflow-results/workflow-results.controller.js
@@ -1,9 +1,9 @@
 export default ['workflowData', 'workflowResultsService', 'workflowDataOptions',
     'jobLabels', 'workflowNodes', '$scope', 'ParseTypeChange',
-    'ParseVariableString', 'count', '$state', 'i18n', 'WorkflowChartService',
+    'ParseVariableString', 'count', '$state', 'i18n', 'WorkflowChartService', '$filter',
     'moment', function(workflowData, workflowResultsService,
     workflowDataOptions, jobLabels, workflowNodes, $scope, ParseTypeChange,
-    ParseVariableString, count, $state, i18n, WorkflowChartService,
+    ParseVariableString, count, $state, i18n, WorkflowChartService, $filter,
     moment) {
         var runTimeElapsedTimer = null;
         let nodeIdToChartNodeIdMapping = {};
diff --git a/awx/ui/client/src/workflow-results/workflow-results.route.js b/awx/ui/client/src/workflow-results/workflow-results.route.js
index 84562c4783..06fbb5f814 100644
--- a/awx/ui/client/src/workflow-results/workflow-results.route.js
+++ b/awx/ui/client/src/workflow-results/workflow-results.route.js
@@ -49,7 +49,7 @@ export default {
         // flashing as rest data comes in. Provides the list of workflow nodes
         workflowNodes: ['workflowData', 'Rest', '$q', function(workflowData, Rest, $q) {
             var defer = $q.defer();
-                Rest.setUrl(workflowData.related.workflow_nodes + '?order_by=id');
+                Rest.setUrl(workflowData.related.workflow_nodes + '?order_by=id&page_size=200');
                 Rest.get()
                     .then(({data}) => {
                         if(data.next) {