diff --git a/awx/ui/static/js/forms/JobTemplates.js b/awx/ui/static/js/forms/JobTemplates.js
index 6cd68fd132..80f28e0030 100644
--- a/awx/ui/static/js/forms/JobTemplates.js
+++ b/awx/ui/static/js/forms/JobTemplates.js
@@ -90,7 +90,7 @@ angular.module('JobTemplateFormDefinition', [])
                 type: 'number', 
                 integer: true,
                 min: 0,
-                max: 100,
+                max: 100000000,
                 slider: true, 
                 "class": 'input-mini',
                 "default": '0',
diff --git a/awx/ui/static/js/lists/Groups.js b/awx/ui/static/js/lists/Groups.js
index cd7ab19686..1ab2d30422 100644
--- a/awx/ui/static/js/lists/Groups.js
+++ b/awx/ui/static/js/lists/Groups.js
@@ -46,7 +46,9 @@ angular.module('GroupListDefinition', [])
                 mode: 'all',
                 'class': 'btn-small btn-info',
                 awToolTip: 'Click for help',
-                dataTitle: 'Adding Groups'
+                dataTitle: 'Adding Groups',
+                id: 'group-help-button',
+                iconSize: 'large'
                 }
             },
 
diff --git a/awx/ui/static/js/lists/Hosts.js b/awx/ui/static/js/lists/Hosts.js
index a35586fb48..3aaaf98a7d 100644
--- a/awx/ui/static/js/lists/Hosts.js
+++ b/awx/ui/static/js/lists/Hosts.js
@@ -38,7 +38,8 @@ angular.module('HostListDefinition', [])
                 'class': 'btn-small btn-info',
                 awToolTip: 'Click for help',
                 dataTitle: 'Selecting Hosts',
-                iconSize: 'large'
+                iconSize: 'large',
+                id: 'host-help-button'
                 }
             },
 
diff --git a/awx/ui/static/js/lists/JobHosts.js b/awx/ui/static/js/lists/JobHosts.js
index 790d45a463..33534af6c8 100644
--- a/awx/ui/static/js/lists/JobHosts.js
+++ b/awx/ui/static/js/lists/JobHosts.js
@@ -94,7 +94,8 @@ angular.module('JobHostDefinition', [])
                 'class': 'btn-info btn-mini btn-help',
                 awToolTip: 'Click for help',
                 dataTitle: 'Job Host Summary',
-                iconSize: 'large'
+                iconSize: 'large',
+                id: 'jobhost-help-button'
                 }
             },
 
diff --git a/awx/ui/static/lib/ansible/directives.js b/awx/ui/static/lib/ansible/directives.js
index b1dcffc324..075a9448eb 100644
--- a/awx/ui/static/lib/ansible/directives.js
+++ b/awx/ui/static/lib/ansible/directives.js
@@ -206,7 +206,18 @@ angular.module('AWDirectives', ['RestServices'])
             var title = (attrs.title != undefined && attrs.title != null) ? attrs.title : 'Help';
             var container = (attrs.container !== undefined) ? attrs.container : false;
             $(element).popover({ placement: placement, delay: 0, title: title, 
-                content: attrs.awPopOver, delay: 0, trigger: 'click', html: true, container: container });
+                content: attrs.awPopOver, trigger: 'manual', html: true, container: container });
+            $(element).click(function() {
+                var me = $(this).attr('id');
+                $('.help-link, .help-link-white').each( function(index) {
+                    if (me != $(this).attr('id')) {
+                       $(this).popover('hide');
+                    }
+                    else {
+                       $(this).popover('toggle');
+                    }
+                    });
+                });
             $(document).bind('keydown', function(e) {
                 if (e.keyCode === 27) {
                    $(element).popover('hide');
diff --git a/awx/ui/static/lib/ansible/form-generator.js b/awx/ui/static/lib/ansible/form-generator.js
index 2c3bf35e60..c9a19ce69c 100644
--- a/awx/ui/static/lib/ansible/form-generator.js
+++ b/awx/ui/static/lib/ansible/form-generator.js
@@ -236,7 +236,7 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies'])
              html += "<label class=\"control-label"; 
              html += (field.labelClass) ? " " + field.labelClass : "";
              html += "\" for=\"" + fld + '">';
-             html += (field.awPopOver) ? this.attr(field, 'awPopOver') : "";
+             html += (field.awPopOver) ? this.attr(field, 'awPopOver', fld) : "";
              html += (field.icon) ? this.icon(field.icon) : "";
              html += field.label + '</label>' + "\n";
              html += "<div class=\"controls\">\n"; 
@@ -308,7 +308,7 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies'])
              
              if (field.label !== false) {
                 html += "<label class=\"control-label\" for=\"" + fld + '">';
-                html += (field.awPopOver) ? this.attr(field, 'awPopOver') : "";
+                html += (field.awPopOver) ? this.attr(field, 'awPopOver', fld) : "";
                 html += field.label + '</label>' + "\n";
                 html += "<div class=\"controls\">\n";
              }
@@ -356,7 +356,7 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies'])
              html += (field.ngShow) ? this.attr(field,'ngShow') : "";
              html += ">\n";
              html += "<label class=\"control-label\" for=\"" + fld + '">';
-             html += (field.awPopOver) ? this.attr(field, 'awPopOver') : "";
+             html += (field.awPopOver) ? this.attr(field, 'awPopOver', fld) : "";
              html += field.label + '</label>' + "\n";
              html += "<div class=\"controls\">\n"; 
              html += "<select ";
@@ -390,7 +390,7 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies'])
              html += (field.ngShow) ? this.attr(field,'ngShow') : "";
              html += ">\n";
              html += "<label class=\"control-label\" for=\"" + fld + '">';
-             html += (field.awPopOver) ? this.attr(field, 'awPopOver') : "";
+             html += (field.awPopOver) ? this.attr(field, 'awPopOver', fld) : "";
              html += field.label + '</label>' + "\n";
              html += "<div class=\"controls\">\n"; 
              // Use 'text' rather than 'number' so that our integer directive works correctly
@@ -448,7 +448,7 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies'])
              html += (field.checked) ? "checked " : "";
              html += (field.readonly) ? "disabled " : "";
              html += " /> " + field.label + "\n";
-             html += (field.awPopOver) ? this.attr(field, 'awPopOver') : "";
+             html += (field.awPopOver) ? this.attr(field, 'awPopOver', fld) : "";
              html += "</label>\n";
              html += "<span class=\"error api-error\" ng-bind=\"" + fld + "_api_error\"></span>\n";
              html += "</div>\n";
@@ -463,7 +463,7 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies'])
              html += (field.ngShow) ? this.attr(field,'ngShow') : "";
              html += ">\n";
              html += "<label class=\"control-label\" for=\"" + fld + '">';
-             html += (field.awPopOver) ? this.attr(field, 'awPopOver') : "";
+             html += (field.awPopOver) ? this.attr(field, 'awPopOver', fld) : "";
              html += field.label + '</label>' + "\n";
              html += "<div class=\"controls\">\n";
              for (var i=0; i < field.options.length; i++) {
@@ -504,7 +504,7 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies'])
           html += (field.ngShow) ? this.attr(field,'ngShow') : "";
           html += ">\n";
           html += "<label class=\"control-label\" for=\"" + fld + '">';
-          html += (field.awPopOver) ? this.attr(field, 'awPopOver') : "";
+          html += (field.awPopOver) ? this.attr(field, 'awPopOver', fld) : "";
           html +=  field.label + '</label>' + "\n";
           html += "<div class=\"controls\">\n";
           html += "<div class=\"input-prepend\">\n";
@@ -547,7 +547,7 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies'])
              html += "<label class=\"control-label"; 
              html += (field.labelClass) ? " " + field.labelClass : "";
              html += "\" for=\"" + fld + '">';
-             html += (field.awPopOver) ? this.attr(field, 'awPopOver') : "";
+             html += (field.awPopOver) ? this.attr(field, 'awPopOver', fld) : "";
              html += (field.icon) ? this.icon(field.icon) : "";
              html += (field.label) ? field.label : '';
              html += '</label>' + "\n";
diff --git a/awx/ui/static/lib/ansible/generator-helpers.js b/awx/ui/static/lib/ansible/generator-helpers.js
index edb313170d..8ba1f24827 100644
--- a/awx/ui/static/lib/ansible/generator-helpers.js
+++ b/awx/ui/static/lib/ansible/generator-helpers.js
@@ -10,7 +10,7 @@
 angular.module('GeneratorHelpers', ['GeneratorHelpers'])
     
     .factory('Attr', function() {
-    return function(obj, key) { 
+    return function(obj, key, fld) { 
         var result;
         var value = (typeof obj[key] === "string") ? obj[key].replace(/[\'\"]/g, '&quot;') : obj[key];
         switch(key) {
@@ -49,7 +49,7 @@ angular.module('GeneratorHelpers', ['GeneratorHelpers'])
                break;
             case 'awPopOver':
                // construct the entire help link
-               result = "<a href=\"\" aw-pop-over=\"" + value + "\" ";
+               result = "<a id=\"awp-" + fld + "\" href=\"\" aw-pop-over=\"" + value + "\" ";
                result += (obj.dataTitle) ? "data-title=\"" + obj['dataTitle'].replace(/[\'\"]/g, '&quot;') + "\" " : "";
                result += (obj.dataPlacement) ? "data-placement=\"" + obj['dataPlacement'].replace(/[\'\"]/g, '&quot;') + "\" " : "";
                result += (obj.dataContainer) ? "data-container=\"" + obj['dataContainer'].replace(/[\'\"]/g, '&quot;') + "\" " : "";
diff --git a/awx/ui/static/lib/ansible/list-generator.js b/awx/ui/static/lib/ansible/list-generator.js
index ce124d9b6c..bd035d833b 100644
--- a/awx/ui/static/lib/ansible/list-generator.js
+++ b/awx/ui/static/lib/ansible/list-generator.js
@@ -34,7 +34,9 @@ angular.module('ListGenerator', ['GeneratorHelpers'])
        var html = '';
        html += "<button " + this.attr(btn, 'ngClick') + "class=\"btn";
        html += (btn['class']) ?  " " + btn['class'] : " btn-small";
+       html += (btn['awPopOver']) ? " help-link-white" : "";
        html += "\" ";
+       html += (btn.id) ? "id=\"" + btn.id + "\" " : "";
        html += (btn.ngHide) ? this.attr(btn,'ngHide') : "";
        html += (btn.awToolTip) ? this.attr(btn,'awToolTip') : "";
        html += (btn.awToolTip && btn.dataPlacement == undefined) ? "data-placement=\"top\" " : "";