diff --git a/awx/ui/static/css/ansible-ui.css b/awx/ui/static/css/ansible-ui.css
index d62c28b5d6..7ae29c2a25 100644
--- a/awx/ui/static/css/ansible-ui.css
+++ b/awx/ui/static/css/ansible-ui.css
@@ -24,7 +24,6 @@
     border-color: #e3e3e3;
  }
 
-
 /* Attempt to make button heights consistent. For some reason success, info, etc. are
    taller than plain .btn */
  .btn-success, .btn-danger, .btn-info, .btn-primary {
@@ -532,7 +531,7 @@
 
 .horizontal-narrow .control-label {
   float: left;
-  width: 80px;
+  width: 120px;
   padding-top: 5px;
   text-align: right;
 }
@@ -540,16 +539,16 @@
 .horizontal-narrow .controls {
   *display: inline-block;
   *padding-left: 20px;
-  margin-left: 100px;
+  margin-left: 140px;
   *margin-left: 0;
 }
 
 .horizontal-narrow .controls:first-child {
-  *padding-left: 100px;
+  *padding-left: 140px;
 }
 
 .modal-input-xlarge {
-   width: 400px;
+   width: 350px;
 }
 
 
diff --git a/awx/ui/static/js/forms/Hosts.js b/awx/ui/static/js/forms/Hosts.js
index 15edca75d7..080d6a9ec0 100644
--- a/awx/ui/static/js/forms/Hosts.js
+++ b/awx/ui/static/js/forms/Hosts.js
@@ -18,10 +18,19 @@ angular.module('HostFormDefinition', [])
 
         fields: {
             name: {
-                label: 'Name',
+                label: 'Host Name',
                 type: 'text',
                 addRequired: true,
-                editRequired: true
+                editRequired: true,
+                awPopOver: "<p>Provide a host name, ip address, or ip address:port. Examples include:</p>" +
+                     "<blockquote>myserver.domain.com<br/>" +
+                     "127.0.0.1<br />" + 
+                     "10.1.0.140:25<br />" +
+                     "server.example.com:25" +
+                     "</blockquote>", 
+                dataTitle: 'Host Name',
+                dataPlacement: 'right',
+                dataContainer: '#form-modal'
                 },
             description: { 
                 label: 'Description',
diff --git a/awx/ui/static/js/forms/Inventories.js b/awx/ui/static/js/forms/Inventories.js
index e928630e59..c2935f2e6b 100644
--- a/awx/ui/static/js/forms/Inventories.js
+++ b/awx/ui/static/js/forms/Inventories.js
@@ -115,7 +115,7 @@ angular.module('InventoryFormDefinition', [])
                 fields: {
                     name: {
                         key: true,
-                        label: 'Name',
+                        label: 'Host Name',
                         ngClick: "editHost(\{\{ host.id \}\}, '\{\{ host.name \}\}')"
                         },
                     has_active_failures: {
diff --git a/awx/ui/static/lib/ansible/directives.js b/awx/ui/static/lib/ansible/directives.js
index ee3cf01332..b1dcffc324 100644
--- a/awx/ui/static/lib/ansible/directives.js
+++ b/awx/ui/static/lib/ansible/directives.js
@@ -204,8 +204,9 @@ angular.module('AWDirectives', ['RestServices'])
         return function(scope, element, attrs) {
             var placement = (attrs.placement != undefined && attrs.placement != null) ? attrs.placement : 'left';
             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 });
+                content: attrs.awPopOver, delay: 0, trigger: 'click', html: true, container: container });
             $(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 6c37568092..b063f263aa 100644
--- a/awx/ui/static/lib/ansible/form-generator.js
+++ b/awx/ui/static/lib/ansible/form-generator.js
@@ -200,6 +200,7 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies'])
                 html += "<a href=\"\" " + this.attr(field,'awPopOver');
                 html += (field.dataTitle) ? this.attr(field, 'dataTitle') : ""; 
                 html += (field.dataPlacement) ? this.attr(field, 'dataPlacement') : "";
+                html += (field.dataContainer) ? this.attr(field, 'dataContainer') : "";
                 html += "><i class=\"icon-info-sign\"></i></a> ";
              }
              html += (field.icon) ? this.icon(field.icon) : "";
diff --git a/awx/ui/static/lib/ansible/generator-helpers.js b/awx/ui/static/lib/ansible/generator-helpers.js
index 5132ab25f8..e302e13f8e 100644
--- a/awx/ui/static/lib/ansible/generator-helpers.js
+++ b/awx/ui/static/lib/ansible/generator-helpers.js
@@ -55,6 +55,9 @@ angular.module('GeneratorHelpers', ['GeneratorHelpers'])
             case 'dataPlacement':
                result = "data-placement=\"" + obj[key] + "\" ";
                break;
+            case 'dataContainer':
+               result = "data-container=\"" + obj[key] + "\" ";
+               break;
             default: 
                result = key + "=\"" + obj[key] + "\" ";
         }