diff --git a/awx/ui/static/js/controllers/JobDetail.js b/awx/ui/static/js/controllers/JobDetail.js
index 528b7461e5..f6c18321d0 100644
--- a/awx/ui/static/js/controllers/JobDetail.js
+++ b/awx/ui/static/js/controllers/JobDetail.js
@@ -653,6 +653,11 @@ function JobDetailController ($scope, $compile, $routeParams, ClearScope, Breadc
             SelectPlay({ scope: scope, id: scope.activePlay });
         }, 2000);
     };
+
+    scope.viewEvent = function(event_id) {
+           
+    }
+    
 }
 
 JobDetailController.$inject = [ '$scope', '$compile', '$routeParams', 'ClearScope', 'Breadcrumbs', 'LoadBreadCrumbs', 'GetBasePath', 'Wait',
diff --git a/awx/ui/static/js/controllers/JobTemplates.js b/awx/ui/static/js/controllers/JobTemplates.js
index 5cdcab71c9..ab02ded44d 100644
--- a/awx/ui/static/js/controllers/JobTemplates.js
+++ b/awx/ui/static/js/controllers/JobTemplates.js
@@ -614,6 +614,9 @@ function JobTemplatesEdit($scope, $rootScope, $compile, $location, $log, $routeP
                 }
 
                 $scope.url = data.url;
+
+                $scope.ask_variables_on_launch = (data.ask_variables_on_launch) ? 'true' : 'false';
+                master.ask_variables_on_launch = $scope.ask_variables_on_launch;
                 
                 relatedSets = form.relatedSets(data.related);
                 
diff --git a/awx/ui/static/js/forms/JobTemplates.js b/awx/ui/static/js/forms/JobTemplates.js
index 200355ef47..31dad61a10 100644
--- a/awx/ui/static/js/forms/JobTemplates.js
+++ b/awx/ui/static/js/forms/JobTemplates.js
@@ -217,7 +217,7 @@ angular.module('JobTemplateFormDefinition', ['SchedulesListDefinition', 'Complet
                 dataPlacement: 'right',
                 dataContainer: "body"
             },
-            vars_prompt_on_launch: {
+             ask_variables_on_launch: {
                 label: 'Prompt for Extra Variables',
                 type: 'checkbox',
                 addRequired: false,
diff --git a/awx/ui/static/js/helpers/JobSubmission.js b/awx/ui/static/js/helpers/JobSubmission.js
index d2221dcc61..a192b24597 100644
--- a/awx/ui/static/js/helpers/JobSubmission.js
+++ b/awx/ui/static/js/helpers/JobSubmission.js
@@ -400,12 +400,12 @@ function($location, Wait, GetBasePath, LookUpInit, JobTemplateForm, CredentialLi
                 Rest.post(job_template).success(function (data) {
                     new_job_id = data.id;
                     launch_url = data.related.start;
-                    prompt_for_vars = data.vars_prompt_on_launch;
+                    prompt_for_vars = data.ask_variables_on_launch;
                     new_job = data;
                     if (data.passwords_needed_to_start.length > 0) {
                         scope.$emit('PromptForPasswords', data.passwords_needed_to_start);
                     }
-                    else if (data.vars_prompt_on_launch) {
+                    else if (data.ask_variables_on_launch) {
                         scope.$emit('PromptForVars');
                     }
                     else {
diff --git a/awx/ui/static/less/ansible-ui.less b/awx/ui/static/less/ansible-ui.less
index 5c66544036..d87b156a44 100644
--- a/awx/ui/static/less/ansible-ui.less
+++ b/awx/ui/static/less/ansible-ui.less
@@ -1379,7 +1379,8 @@ input[type="checkbox"].checkbox-no-label {
       text-overflow: clip;*/
   }
 
-  #group-delete-dialog .help-container {
+  #group-delete-dialog .help-container,
+  #password-modal .help-container {
       .help-link,
       .help-link:active,
       .help-link:visited {
diff --git a/awx/ui/static/partials/job_detail.html b/awx/ui/static/partials/job_detail.html
index c42cad0ba7..fb4727aa3c 100644
--- a/awx/ui/static/partials/job_detail.html
+++ b/awx/ui/static/partials/job_detail.html
@@ -114,7 +114,7 @@
                                 <div id="hosts-table-detail-inner">
                                     <div class="row" ng-repeat="result in results = (hostResults | filter:{ status : searchAllStatus} | filter:{ task_id: activeTask })">
                                         <div class="col-lg-7 col-md-7 col-sm-7 col-xs-7 status-column">
-                                            <a href="" ng-click="doSomething()" aw-tool-tip="Event Id: {{ result.id }} Status: {{ result.status }}. Click for details" data-placement="top"><i class="fa icon-job-{{ result.status }}"></i> {{ result.name }}</a>
+                                            <a href="" ng-click="viewEvent(result.id)" aw-tool-tip="Event Id: {{ result.id }} Status: {{ result.status }}. Click for details" data-placement="top"><i class="fa icon-job-{{ result.status }}"></i> {{ result.name }}</a>
                                         </div>
                                         <div class="col-lg-5 col-md-5 col-sm-5 col-xs-5">
                                             {{ result.msg }}