diff --git a/awx/ui/client/src/forms/Credentials.js b/awx/ui/client/src/forms/Credentials.js
index 92642bf239..f81a999fab 100644
--- a/awx/ui/client/src/forms/Credentials.js
+++ b/awx/ui/client/src/forms/Credentials.js
@@ -67,14 +67,18 @@ export default
                             '<dd>Authentication for remote machine access. This can include SSH keys, usernames, passwords, ' +
                             'and sudo information. Machine credentials are used when submitting jobs to run playbooks against ' +
                             'remote hosts.</dd>' +
+                            '<dt>Network</dt>\n' +
+                            '<dd>Authentication for network device access. This can include SSH keys, usernames, passwords, ' +
+                            'and authorize information. Network credentials are used when submitting jobs to run playbooks against ' +
+                            'network devices.</dd>' +
                             '<dt>Source Control</dt>\n' +
                             '<dd>Used to check out and synchronize playbook repositories with a remote source control ' +
                             'management system such as Git, Subversion (svn), or Mercurial (hg). These credentials are ' +
-                            'used on the Projects tab.</dd>\n' +
+                            'used by Projects.</dd>\n' +
                             '<dt>Others (Cloud Providers)</dt>\n' +
-                            '<dd>Access keys for authenticating to the specific ' +
-                            'cloud provider, usually used for inventory sync ' +
-                            'and deployment.</dd>\n' +
+                            '<dd>Usernames, passwords, and access keys for authenticating to the specified cloud or infrastructure ' +
+                            'provider. These are used for dynamic inventory sources and for cloud provisioning and deployment ' +
+                            'in playbook runs.</dd>\n' +
                             '</dl>\n',
                     dataTitle: 'Type',
                     dataPlacement: 'right',
@@ -239,7 +243,6 @@ export default
                     },
                     class: 'Form-textAreaLabel Form-formGroup--fullWidth',
                     elementClass: 'Form-monospace',
-                    hintText: "{{ key_hint }}",
                     addRequired: false,
                     editRequired: false,
                     awDropFile: true,
diff --git a/awx/ui/client/src/forms/Groups.js b/awx/ui/client/src/forms/Groups.js
index 49527df717..9a42ad6218 100644
--- a/awx/ui/client/src/forms/Groups.js
+++ b/awx/ui/client/src/forms/Groups.js
@@ -134,6 +134,7 @@ export default
                         "<li>Security Group: <strong>security_groups &raquo; security_group_default</strong></li>" +
                         "<li>Tags: <strong>tags &raquo; tag_Name &raquo; tag_Name_host1</strong></li>" +
                         "<li>VPC ID: <strong>vpcs &raquo; vpc-5ca1ab1e</strong></li>" +
+                        "<li>Tag None: <strong>tags &raquo; tag_none</strong></li>" +
                         "</ul><p>If blank, all groups above are created except <em>Instance ID</em>.</p>",
                     dataContainer: 'body'
                 },
@@ -161,11 +162,14 @@ export default
                     parseTypeName: 'envParseType',
                     dataTitle: "Environment Variables",
                     dataPlacement: 'right',
-                    awPopOver:  "<p>Provide key/value pairs using either YAML or JSON.</p>" +
+                    awPopOver:  "<p>Provide environment variables to pass to the custom inventory script.</p>" +
+                        "<p>Enter variables using either JSON or YAML syntax. Use the radio button to toggle between the two.</p>" +
                         "JSON:<br />\n" +
                         "<blockquote>{<br />&emsp;\"somevar\": \"somevalue\",<br />&emsp;\"password\": \"magic\"<br /> }</blockquote>\n" +
                         "YAML:<br />\n" +
-                        "<blockquote>---<br />somevar: somevalue<br />password: magic<br /></blockquote>\n",
+                        "<blockquote>---<br />somevar: somevalue<br />password: magic<br /></blockquote>\n" +
+                        '<p>View JSON examples at <a href="http://www.json.org" target="_blank">www.json.org</a></p>' +
+                        '<p>View YAML examples at <a href="http://docs.ansible.com/YAMLSyntax.html" target="_blank">docs.ansible.com</a></p>',
                     dataContainer: 'body'
                 },
                 ec2_variables: {
diff --git a/awx/ui/client/src/forms/JobTemplates.js b/awx/ui/client/src/forms/JobTemplates.js
index 2751a50f13..78547e2328 100644
--- a/awx/ui/client/src/forms/JobTemplates.js
+++ b/awx/ui/client/src/forms/JobTemplates.js
@@ -46,8 +46,9 @@ export default
                     editRequired: true,
                     column: 1,
                     awPopOver: "<p>When this template is submitted as a job, setting the type to <em>run</em> will execute the playbook, running tasks " +
-                        " on the selected hosts.</p> <p>Setting the type to <em>check</em> will not execute the playbook. Instead, ansible will check playbook " +
-                        " syntax, test environment setup and report problems.</p>",
+                        " on the selected hosts.</p> <p>Setting the type to <em>check</em> will not execute the playbook. Instead, <code>ansible</code> will check playbook " +
+                        " syntax, test environment setup and report problems.</p> <p>Setting the type to <em>scan</em> will execute the playbook and store any " +
+                        " scanned facts for use with Tower's System Tracking feature.</p>",
                     dataTitle: 'Job Type',
                     dataPlacement: 'right',
                     dataContainer: "body",
@@ -230,7 +231,7 @@ export default
                   addRequired: false,
                   editRequird: false,
                   column: 2,
-                  awPopOver: "<p>If enabled,  run this playbook as an administrator. This is the equivalent of passing the<code> --become</code> option to the <code> ansible-playbook</code> command. </p>",
+                  awPopOver: "<p>If enabled, run this playbook as an administrator. This is the equivalent of passing the <code>--become</code> option to the <code>ansible-playbook</code> command. </p>",
                   dataPlacement: 'right',
                   dataTitle: 'Become Privilege Escalation',
                   dataContainer: "body"
@@ -285,7 +286,7 @@ export default
                     editRequired: false,
                     dataTitle: 'Labels',
                     dataPlacement: 'right',
-                    awPopOver: 'You can add labels to a job template to aid in filtering',
+                    awPopOver: "<p>Optional labels that describe this job template, such as 'dev' or 'test'. Labels can be used to group and filter job templates and completed jobs in the Tower display.</p>",
                     dataContainer: 'body'
                 },
                 variables: {
@@ -297,8 +298,8 @@ export default
                     editRequired: false,
                     "default": "---",
                     column: 2,
-                    awPopOver: "<p>Pass extra command line variables to the playbook. This is the -e or --extra-vars command line parameter " +
-                        "for ansible-playbook. Provide key/value pairs using either YAML or JSON.</p>" +
+                    awPopOver: "<p>Pass extra command line variables to the playbook. This is the <code>-e</code> or <code>--extra-vars</code> command line parameter " +
+                        "for <code>ansible-playbook</code>. Provide key/value pairs using either YAML or JSON.</p>" +
                         "JSON:<br />\n" +
                         "<blockquote>{<br />&emsp;\"somevar\": \"somevalue\",<br />&emsp;\"password\": \"magic\"<br /> }</blockquote>\n" +
                         "YAML:<br />\n" +
diff --git a/awx/ui/client/src/helpers/Credentials.js b/awx/ui/client/src/helpers/Credentials.js
index f9960e550e..81037560e2 100644
--- a/awx/ui/client/src/helpers/Credentials.js
+++ b/awx/ui/client/src/helpers/Credentials.js
@@ -39,7 +39,6 @@ angular.module('CredentialsHelper', ['Utilities'])
                  scope.project_required = false;
                  scope.subscription_required = false;
                  scope.key_description = "Paste the contents of the SSH private key file.<div class=\"popover-footer\"><span class=\"key\">esc</span> or click to close</div>";
-                 scope.key_hint= "paste or drag and drop an SSH private key file on the field below";
                  scope.host_required = false;
                  scope.password_required = false;
                  scope.hostLabel = '';
@@ -65,7 +64,6 @@ angular.module('CredentialsHelper', ['Utilities'])
                  scope.domain_required = false;
                  scope.subscription_required = false;
                  scope.key_description = "Paste the contents of the SSH private key file.";
-                 scope.key_hint= "paste or drag and drop an SSH private key file on the field below";
                  scope.host_required = false;
                  scope.password_required = false;
                  scope.hostLabel = '';
@@ -101,7 +99,6 @@ angular.module('CredentialsHelper', ['Utilities'])
                              scope.key_required = true;
                              scope.project_required = true;
                              scope.key_description =  'Paste the contents of the PEM file associated with the service account email.';
-                             scope.key_hint= "drag and drop a private key file on the field below";
                              scope.projectLabel = "Project";
                              scope.project_required = false;
                              scope.projectPopOver = "<p>The Project ID is the " +
@@ -114,7 +111,6 @@ angular.module('CredentialsHelper', ['Utilities'])
                              scope.subscription_required = true;
                              scope.key_required = true;
                              scope.key_description = "Paste the contents of the PEM file that corresponds to the certificate you uploaded in the Microsoft Azure console.";
-                             scope.key_hint= "drag and drop a management certificate file on the field below";
                          break;
                          case 'azure_rm':
                              scope.usernameLabel = "Username";
diff --git a/awx/ui/client/src/notifications/notificationTemplates.form.js b/awx/ui/client/src/notifications/notificationTemplates.form.js
index 0a4b2d5499..a49c7a126b 100644
--- a/awx/ui/client/src/notifications/notificationTemplates.form.js
+++ b/awx/ui/client/src/notifications/notificationTemplates.form.js
@@ -185,6 +185,8 @@ export default function() {
             from_number: {
                 label: 'Source Phone Number',
                 type: 'text',
+                awPopOver: '<p>Number associated with the "Messaging Service" in Twilio.</p>'+
+                            '<p>This must be of the form <code>+18005550199</code>.</p>',
                 awRequiredWhen: {
                     reqExpression: "twilio_required",
                     init: "false"
@@ -197,8 +199,8 @@ export default function() {
                 type: 'textarea',
                 rows: 3,
                 awPopOver: '<p>Type an option on each line.</p>'+
-                            '<p>For example:<br>alias1@email.com<br>\n alias2@email.com<br>\n',
-                dataTitle: 'Destination Channels',
+                            '<p>For example:<br><code>+12125552368</code><br>\n<code>+19105556162</code><br>\n',
+                dataTitle: 'Destination SMS Number',
                 dataPlacement: 'right',
                 dataContainer: "body",
                 awRequiredWhen: {
@@ -272,6 +274,8 @@ export default function() {
             color: {
                 label: 'Notification Color',
                 type: 'text',
+                awPopOver: '<p>Color can be one of <code>yellow</code>, <code>green</code>, <code>red</code>, ' +
+                           '<code>purple</code>, <code>gray</code>, or <code>random</code>.\n',
                 awRequiredWhen: {
                     reqExpression: "hipchat_required",
                     init: "false"