diff --git a/awx/ui/client/src/inventories/manage/manage-groups/directive/manage-groups.directive.partial.html b/awx/ui/client/src/inventories/manage/manage-groups/directive/manage-groups.directive.partial.html
index 86368afbe4..eacbf795c9 100644
--- a/awx/ui/client/src/inventories/manage/manage-groups/directive/manage-groups.directive.partial.html
+++ b/awx/ui/client/src/inventories/manage/manage-groups/directive/manage-groups.directive.partial.html
@@ -4,14 +4,16 @@
             <i class="fa fa-times-circle"></i>
         </button>
     </div>
-    <div id="group-manage-panel"></div>
-    <div id="properties-tab"></div>
-    <div id="sources-tab"></div>
+    <div id="group-manage-panel">
+			<div id="properties-tab"></div>
+	    <div id="sources-tab"></div>
+		</div>
+
     <div class="ui-dialog-buttonpane ui-widget-content ui-helper-clearfix">
         <div class="ui-dialog-buttonset">
             <button type="button" class="btn btn-primary Form-saveButton" id="Inventory-groupManage--okButton" ng-click="vm.saveGroup()">
                 Save</button>
-            <button type="button" class="btn btn-default Form-cancelButton" id="Inventory-groupManage--cancelButton" ng-click="vm.cancelModal()">
+            <button type="button" class="btn btn-default Form-cancelButton" id="Inventory-groupManage--cancelButton" ng-click="vm.cancelPanel()">
                 Cancel</button>
         </div>
     </div>
diff --git a/awx/ui/client/src/inventories/manage/manage-hosts/directive/manage-hosts.directive.controller.js b/awx/ui/client/src/inventories/manage/manage-hosts/directive/manage-hosts.directive.controller.js
index 1fdf0d157a..5fde6e3991 100644
--- a/awx/ui/client/src/inventories/manage/manage-hosts/directive/manage-hosts.directive.controller.js
+++ b/awx/ui/client/src/inventories/manage/manage-hosts/directive/manage-hosts.directive.controller.js
@@ -41,7 +41,7 @@ function manageHostsDirectiveController($rootScope, $location, $log, $stateParam
         });
     generator.reset();
 
-    var name = scope.name;
+
     scope.parseType = 'yaml';
 
     // Retrieve detail record and prepopulate the form
@@ -68,7 +68,6 @@ function manageHostsDirectiveController($rootScope, $location, $log, $stateParam
                 }
                 scope.variable_url = data.related.variable_data;
                 scope.has_inventory_sources = data.has_inventory_sources;
-                //scope.$emit('hostVariablesLoaded');
             })
             .error(function(data, status) {
                 ProcessErrors(parent_scope, data, status, form, {
@@ -172,10 +171,12 @@ function manageHostsDirectiveController($rootScope, $location, $log, $stateParam
         $state.go('inventoryManage');
     };
 
+
+
     angular.extend(vm, {
         cancelPanel: cancelPanel,
-        name: name,
         saveHost: saveHost,
+				mode: mode
     });
 }
 
diff --git a/awx/ui/client/src/inventories/manage/manage-hosts/directive/manage-hosts.directive.partial.html b/awx/ui/client/src/inventories/manage/manage-hosts/directive/manage-hosts.directive.partial.html
index 7ebdcbbf8d..31c2249234 100644
--- a/awx/ui/client/src/inventories/manage/manage-hosts/directive/manage-hosts.directive.partial.html
+++ b/awx/ui/client/src/inventories/manage/manage-hosts/directive/manage-hosts.directive.partial.html
@@ -1,17 +1,25 @@
 <div>
-    <div class="Form-exitHolder">
-        <button class="Form-exit" ng-click="vm.cancelPanel()">
-            <i class="fa fa-times-circle"></i>
-        </button>
-    </div>
-    <div id="host-panel-form">
-    </div>
-    <div class="ui-dialog-buttonpane ui-widget-content ui-helper-clearfix">
-        <div class="ui-dialog-buttonset">
-            <button type="button" class="btn btn-primary Form-saveButton" id="Inventory-hostManage--okButton" ng-click="vm.saveHost()">
-                Save</button>
-            <button type="button" class="btn btn-default Form-cancelButton" id="Inventory-hostManage--cancelButton" ng-click="vm.cancelPanel()">
-                Cancel</button>
-        </div>
+  <div class="Form-header" ng-if="vm.mode === 'add'">
+    <div class="Form-title ng-binding" >Create Host</div>
+		<div class="Form-exitHolder">
+			<button class="Form-exit" ng-click="vm.cancelPanel()">
+				<i class="fa fa-times-circle"></i>
+			</button>
+		</div>
+  </div>
+	<div class="Form-exitHolder" ng-if="vm.mode === 'edit'">
+		<button class="Form-exit" ng-click="vm.cancelPanel()">
+			<i class="fa fa-times-circle"></i>
+		</button>
+	</div>
+
+  <div id="host-panel-form"></div>
+  <div class="ui-dialog-buttonpane ui-widget-content ui-helper-clearfix">
+    <div class="ui-dialog-buttonset">
+      <button type="button" class="btn btn-primary Form-saveButton" id="Inventory-hostManage--okButton" ng-click="vm.saveHost()">
+        Save</button>
+      <button type="button" class="btn btn-default Form-cancelButton" id="Inventory-hostManage--cancelButton" ng-click="vm.cancelPanel()">
+        Cancel</button>
     </div>
+  </div>
 </div>
diff --git a/awx/ui/client/src/inventories/manage/manage.block.less b/awx/ui/client/src/inventories/manage/manage.block.less
index 46598719be..15b41dfd53 100644
--- a/awx/ui/client/src/inventories/manage/manage.block.less
+++ b/awx/ui/client/src/inventories/manage/manage.block.less
@@ -3,4 +3,10 @@
         border: none;
         text-align: right;
     }
+
+		#host-panel-form, #properties-tab {
+			.Form-header {
+				margin-top: -20px;
+			}
+		}
 }