diff --git a/awx/ui/client/src/helpers/Hosts.js b/awx/ui/client/src/helpers/Hosts.js
index 1e4e22bec7..6a7b864e02 100644
--- a/awx/ui/client/src/helpers/Hosts.js
+++ b/awx/ui/client/src/helpers/Hosts.js
@@ -437,14 +437,12 @@ angular.module('HostsHelper', [ 'RestServices', 'Utilities', listGenerator.name,
 
 .factory('HostsEdit', ['$rootScope', '$location', '$log', '$stateParams', 'Rest', 'Alert', 'HostForm', 'GenerateForm',
          'Prompt', 'ProcessErrors', 'GetBasePath', 'HostsReload', 'ParseTypeChange', 'Wait', 'Find', 'SetStatus', 'ApplyEllipsis',
-         'ToJSON', 'ParseVariableString', 'CreateDialog', 'TextareaResize', 'ScopePass',
+         'ToJSON', 'ParseVariableString', 'CreateDialog', 'TextareaResize', 'ParamPass',
          function($rootScope, $location, $log, $stateParams, Rest, Alert, HostForm, GenerateForm, Prompt, ProcessErrors,
                   GetBasePath, HostsReload, ParseTypeChange, Wait, Find, SetStatus, ApplyEllipsis, ToJSON,
-                  ParseVariableString, CreateDialog, TextareaResize, ScopePass) {
+                  ParseVariableString, CreateDialog, TextareaResize, ParamPass) {
                       return function(params) {
-                          ScopePass.set(params);
-                          var passing = ScopePass.get();
-                          console.info(passing);
+
                           var parent_scope = params.host_scope,
                           group_scope = params.group_scope,
                           host_id = params.host_id,
diff --git a/awx/ui/client/src/inventories/manage/inventory-manage.controller.js b/awx/ui/client/src/inventories/manage/inventory-manage.controller.js
index 58c50dfbe2..a5c215bb0a 100644
--- a/awx/ui/client/src/inventories/manage/inventory-manage.controller.js
+++ b/awx/ui/client/src/inventories/manage/inventory-manage.controller.js
@@ -18,7 +18,7 @@ function InventoriesManage($log, $scope, $rootScope, $location,
     ViewUpdateStatus, GroupsDelete, Store, HostsEdit, HostsDelete,
     EditInventoryProperties, ToggleHostEnabled, ShowJobSummary,
     InventoryGroupsHelp, HelpDialog,
-    GroupsCopy, HostsCopy, $stateParams) {
+    GroupsCopy, HostsCopy, $stateParams, ParamPass) {
 
     var PreviousSearchParams,
         url,
@@ -335,22 +335,38 @@ function InventoriesManage($log, $scope, $rootScope, $location,
 
     $scope.createGroup = function () {
         PreviousSearchParams = Store('group_current_search_params');
-        GroupsEdit({
+        // GroupsEdit({
+        //     scope: $scope,
+        //     inventory_id: $scope.inventory.id,
+        //     group_id: $scope.selected_group_id,
+        //     mode: 'add'
+        // });
+        var params = {
             scope: $scope,
             inventory_id: $scope.inventory.id,
             group_id: $scope.selected_group_id,
             mode: 'add'
-        });
+        }
+        ParamPass.set(params);
+        $state.go('inventoryManage.addGroup');
     };
 
     $scope.editGroup = function (id) {
         PreviousSearchParams = Store('group_current_search_params');
-        GroupsEdit({
+        // GroupsEdit({
+        //     scope: $scope,
+        //     inventory_id: $scope.inventory.id,
+        //     group_id: id,
+        //     mode: 'edit'
+        // });
+        var params = {
             scope: $scope,
             inventory_id: $scope.inventory.id,
             group_id: id,
             mode: 'edit'
-        });
+        }
+        ParamPass.set(params);
+        $state.go('inventoryManage.editGroup', {group_id: id});
     };
 
     // Launch inventory sync
@@ -416,24 +432,44 @@ function InventoriesManage($log, $scope, $rootScope, $location,
     };
 
     hostScope.createHost = function () {
-        HostsEdit({
+        // HostsEdit({
+        //     host_scope: hostScope,
+        //     group_scope: $scope,
+        //     mode: 'add',
+        //     host_id: null,
+        //     selected_group_id: $scope.selected_group_id,
+        //     inventory_id: $scope.inventory.id
+        // });
+
+        var params = {
             host_scope: hostScope,
             group_scope: $scope,
             mode: 'add',
             host_id: null,
             selected_group_id: $scope.selected_group_id,
             inventory_id: $scope.inventory.id
-        });
+        }
+        ParamPass.set(params);
+        $state.go('inventoryManage.addHost');
     };
 
     hostScope.editHost = function (host_id) {
-        HostsEdit({
+        // HostsEdit({
+        //     host_scope: hostScope,
+        //     group_scope: $scope,
+        //     mode: 'edit',
+        //     host_id: host_id,
+        //     inventory_id: $scope.inventory.id
+        // });
+        var params = {
             host_scope: hostScope,
             group_scope: $scope,
             mode: 'edit',
             host_id: host_id,
             inventory_id: $scope.inventory.id
-        });
+        }
+        ParamPass.set(params);
+        $state.go('inventoryManage.editHost', {host_id: host_id});
     };
 
     hostScope.deleteHost = function (host_id, host_name) {
@@ -526,5 +562,5 @@ export default [
         'GroupsDelete', 'Store', 'HostsEdit', 'HostsDelete',
         'EditInventoryProperties', 'ToggleHostEnabled', 'ShowJobSummary',
         'InventoryGroupsHelp', 'HelpDialog', 'GroupsCopy',
-        'HostsCopy', '$stateParams', InventoriesManage,
+        'HostsCopy', '$stateParams', 'ParamPass', InventoriesManage,
 ];
diff --git a/awx/ui/client/src/inventories/manage/inventory-manage.partial.html b/awx/ui/client/src/inventories/manage/inventory-manage.partial.html
index c04eb31552..f465ef47c0 100644
--- a/awx/ui/client/src/inventories/manage/inventory-manage.partial.html
+++ b/awx/ui/client/src/inventories/manage/inventory-manage.partial.html
@@ -1,7 +1,5 @@
 <div class="tab-pane" id="inventory_edit">
-    <div ui-view="manage" class="manage">
-
-    </div>
+    <div ui-view></div>
     <div ng-cloak id="htmlTemplate">
 
         <div class="row">
@@ -12,9 +10,6 @@
                 <div id="host-list-container" class="Panel"></div>
             </div>
         </div>
-
-        <div id="inventory-modal-container"></div>
-
         <div id="group-copy-dialog" style="display: none;">
             <div id="copy-group-radio-container" class="well">
                 <div class="title"><span class="highlight">1.</span> Copy or move <span ng-bind="name"></span>?</div>
diff --git a/awx/ui/client/src/inventories/manage/main.js b/awx/ui/client/src/inventories/manage/main.js
index c33658777f..075ba36887 100644
--- a/awx/ui/client/src/inventories/manage/main.js
+++ b/awx/ui/client/src/inventories/manage/main.js
@@ -5,15 +5,15 @@
  *************************************************/
 
 import route from './inventory-manage.route';
-import controller from './inventory-manage.controller';
 
-import manageHostsDirective from './manage-hosts/manage-hosts.directive';
-import manageHostsRoute from './manage-hosts/manage-hosts.route';
+import manageHosts from './manage-hosts/main';
+import manageGroups from './manage-groups/main';
 
 export default
-angular.module('inventoryManage', [])
-    .directive('manageHosts', manageHostsDirective)
+angular.module('inventoryManage', [
+        manageHosts.name,
+        manageGroups.name
+    ])
     .run(['$stateExtender', function($stateExtender) {
         $stateExtender.addState(route);
-        $stateExtender.addState(manageHostsRoute);
     }]);
diff --git a/awx/ui/client/src/inventories/manage/manage-groups/directive/manage-groups.directive.controller.js b/awx/ui/client/src/inventories/manage/manage-groups/directive/manage-groups.directive.controller.js
new file mode 100644
index 0000000000..37405a5eab
--- /dev/null
+++ b/awx/ui/client/src/inventories/manage/manage-groups/directive/manage-groups.directive.controller.js
@@ -0,0 +1,540 @@
+/*************************************************
+ * Copyright (c) 2016 Ansible, Inc.
+ *
+ * All Rights Reserved
+ *************************************************/
+
+function manageGroupsDirectiveController($filter, $rootScope, $location, $log, $stateParams, $compile, $state, $scope, Rest, Alert, GroupForm, GenerateForm, Prompt, ProcessErrors,
+    GetBasePath, SetNodeName, ParseTypeChange, GetSourceTypeOptions, InventoryUpdate, LookUpInit, Empty, Wait,
+    GetChoices, UpdateGroup, SourceChange, Find, ParseVariableString, ToJSON, GroupsScheduleListInit,
+    SourceForm, SetSchedulesInnerDialogSize, CreateSelect2, ParamPass) {
+
+    var vm = this;
+    var params = ParamPass.get();
+    if(params === undefined) {
+        params = {};
+        params.scope = $scope.$new();
+    }
+    var parent_scope = params.scope,
+        group_id = $stateParams.group_id,
+        mode = $state.current.data.mode, // 'add' or 'edit'
+        inventory_id = $stateParams.inventory_id,
+        generator = GenerateForm,
+        group_created = false,
+        defaultUrl,
+        master = {},
+        choicesReady,
+        modal_scope = parent_scope.$new(),
+        properties_scope = parent_scope.$new(),
+        sources_scope = parent_scope.$new(),
+        elem, group,
+        schedules_url = '';
+
+    if (mode === 'edit') {
+        defaultUrl = GetBasePath('groups') + group_id + '/';
+    } else {
+        defaultUrl = (group_id !== undefined) ? GetBasePath('groups') + group_id + '/children/' :
+            GetBasePath('inventory') + inventory_id + '/groups/';
+    }
+
+    Rest.setUrl(defaultUrl);
+    Rest.get()
+        .success(function(data) {
+            group = data;
+            for (var fld in GroupForm.fields) {
+                if (data[fld]) {
+                    properties_scope[fld] = data[fld];
+                    master[fld] = properties_scope[fld];
+                }
+            }
+            if(mode === 'edit') {
+                schedules_url = data.related.inventory_source + 'schedules/';
+                properties_scope.variable_url = data.related.variable_data;
+                sources_scope.source_url = data.related.inventory_source;
+                modal_scope.$emit('LoadSourceData');
+            }
+        })
+        .error(function(data, status) {
+            ProcessErrors(modal_scope, data, status, {
+                hdr: 'Error!',
+                msg: 'Failed to retrieve group: ' + defaultUrl + '. GET status: ' + status
+            });
+        });
+
+
+    $('#properties-tab').empty();
+    $('#sources-tab').empty();
+
+    elem = document.getElementById('group-manage-panel');
+    $compile(elem)(modal_scope);
+
+    var form_scope =
+        generator.inject(GroupForm, {
+            mode: mode,
+            id: 'properties-tab',
+            related: false,
+            scope: properties_scope,
+            cancelButton: false
+        });
+    var source_form_scope =
+        generator.inject(SourceForm, {
+            mode: mode,
+            id: 'sources-tab',
+            related: false,
+            scope: sources_scope,
+            cancelButton: false
+        });
+
+    generator.reset();
+
+    GetSourceTypeOptions({
+        scope: sources_scope,
+        variable: 'source_type_options'
+    });
+    sources_scope.source = SourceForm.fields.source['default'];
+    sources_scope.sourcePathRequired = false;
+    sources_scope[SourceForm.fields.source_vars.parseTypeName] = 'yaml';
+    sources_scope.update_cache_timeout = 0;
+    properties_scope.parseType = 'yaml';
+
+    function waitStop() {
+        Wait('stop');
+    }
+
+    function initSourceChange() {
+        parent_scope.showSchedulesTab = (mode === 'edit' && sources_scope.source && sources_scope.source.value !== "manual") ? true : false;
+        SourceChange({
+            scope: sources_scope,
+            form: SourceForm
+        });
+    }
+
+    // JT -- this gets called after the properties & properties variables are loaded, and is emitted from (groupLoaded)
+    if (modal_scope.removeLoadSourceData) {
+        modal_scope.removeLoadSourceData();
+    }
+    modal_scope.removeLoadSourceData = modal_scope.$on('LoadSourceData', function() {
+        if (sources_scope.source_url) {
+            // get source data
+            Rest.setUrl(sources_scope.source_url);
+            Rest.get()
+                .success(function(data) {
+                    var fld, i, j, flag, found, set, opts, list, form;
+                    form = SourceForm;
+                    for (fld in form.fields) {
+                        if (fld === 'checkbox_group') {
+                            for (i = 0; i < form.fields[fld].fields.length; i++) {
+                                flag = form.fields[fld].fields[i];
+                                if (data[flag.name] !== undefined) {
+                                    sources_scope[flag.name] = data[flag.name];
+                                    master[flag.name] = sources_scope[flag.name];
+                                }
+                            }
+                        }
+                        if (fld === 'source') {
+                            found = false;
+                            data.source = (data.source === "") ? "manual" : data.source;
+                            for (i = 0; i < sources_scope.source_type_options.length; i++) {
+                                if (sources_scope.source_type_options[i].value === data.source) {
+                                    sources_scope.source = sources_scope.source_type_options[i];
+                                    found = true;
+                                }
+                            }
+                            if (!found || sources_scope.source.value === "manual") {
+                                sources_scope.groupUpdateHide = true;
+                            } else {
+                                sources_scope.groupUpdateHide = false;
+                            }
+                            master.source = sources_scope.source;
+                        } else if (fld === 'source_vars') {
+                            // Parse source_vars, converting to YAML.
+                            sources_scope.source_vars = ParseVariableString(data.source_vars);
+                            master.source_vars = sources_scope.variables;
+                        } else if (fld === "inventory_script") {
+                            // the API stores it as 'source_script', we call it inventory_script
+                            data.summary_fields['inventory_script'] = data.summary_fields.source_script;
+                            sources_scope.inventory_script = data.source_script;
+                            master.inventory_script = sources_scope.inventory_script;
+                        } else if (fld === "source_regions") {
+                            if (data[fld] === "") {
+                                sources_scope[fld] = data[fld];
+                                master[fld] = sources_scope[fld];
+                            } else {
+                                sources_scope[fld] = data[fld].split(",");
+                                master[fld] = sources_scope[fld];
+                            }
+                        } else if (data[fld] !== undefined) {
+                            sources_scope[fld] = data[fld];
+                            master[fld] = sources_scope[fld];
+                        }
+
+                        if (form.fields[fld].sourceModel && data.summary_fields &&
+                            data.summary_fields[form.fields[fld].sourceModel]) {
+                            sources_scope[form.fields[fld].sourceModel + '_' + form.fields[fld].sourceField] =
+                                data.summary_fields[form.fields[fld].sourceModel][form.fields[fld].sourceField];
+                            master[form.fields[fld].sourceModel + '_' + form.fields[fld].sourceField] =
+                                data.summary_fields[form.fields[fld].sourceModel][form.fields[fld].sourceField];
+                        }
+                    }
+
+                    initSourceChange();
+
+                    if (data.source_regions) {
+                        if (data.source === 'ec2' ||
+                            data.source === 'rax' ||
+                            data.source === 'gce' ||
+                            data.source === 'azure') {
+                            if (data.source === 'ec2') {
+                                set = sources_scope.ec2_regions;
+                            } else if (data.source === 'rax') {
+                                set = sources_scope.rax_regions;
+                            } else if (data.source === 'gce') {
+                                set = sources_scope.gce_regions;
+                            } else if (data.source === 'azure') {
+                                set = sources_scope.azure_regions;
+                            }
+                            opts = [];
+                            list = data.source_regions.split(',');
+                            for (i = 0; i < list.length; i++) {
+                                for (j = 0; j < set.length; j++) {
+                                    if (list[i] === set[j].value) {
+                                        opts.push({
+                                            id: set [j].value,
+                                            text: set [j].label
+                                        });
+                                    }
+                                }
+                            }
+                            master.source_regions = opts;
+                            CreateSelect2({
+                                element: "#source_source_regions",
+                                opts: opts
+                            });
+
+                        }
+                    } else {
+                        // If empty, default to all
+                        master.source_regions = [{
+                            id: 'all',
+                            text: 'All'
+                        }];
+                    }
+                    if (data.group_by && data.source === 'ec2') {
+                        set = sources_scope.ec2_group_by;
+                        opts = [];
+                        list = data.group_by.split(',');
+                        for (i = 0; i < list.length; i++) {
+                            for (j = 0; j < set.length; j++) {
+                                if (list[i] === set[j].value) {
+                                    opts.push({
+                                        id: set [j].value,
+                                        text: set [j].label
+                                    });
+                                }
+                            }
+                        }
+                        master.group_by = opts;
+                        CreateSelect2({
+                            element: "#source_group_by",
+                            opts: opts
+                        });
+                    }
+                    sources_scope.group_update_url = data.related.update;
+                })
+                .error(function(data, status) {
+                    sources_scope.source = "";
+                    ProcessErrors(modal_scope, data, status, null, {
+                        hdr: 'Error!',
+                        msg: 'Failed to retrieve inventory source. GET status: ' + status
+                    });
+                });
+        }
+    });
+
+    if (sources_scope.removeScopeSourceTypeOptionsReady) {
+        sources_scope.removeScopeSourceTypeOptionsReady();
+    }
+    sources_scope.removeScopeSourceTypeOptionsReady = sources_scope.$on('sourceTypeOptionsReady', function() {
+        if (mode === 'add') {
+            sources_scope.source = Find({
+                list: sources_scope.source_type_options,
+                key: 'value',
+                val: ''
+            });
+            modal_scope.showSchedulesTab = false;
+        }
+    });
+
+    choicesReady = 0;
+
+    if (sources_scope.removeChoicesReady) {
+        sources_scope.removeChoicesReady();
+    }
+    sources_scope.removeChoicesReady = sources_scope.$on('choicesReadyGroup', function() {
+        CreateSelect2({
+            element: '#source_source',
+            multiple: false
+        });
+        modal_scope.$emit('LoadSourceData');
+
+        choicesReady++;
+        if (choicesReady === 5) {
+            if (mode !== 'edit') {
+                properties_scope.variables = "---";
+                master.variables = properties_scope.variables;
+            }
+        }
+    });
+
+    // Load options for source regions
+    GetChoices({
+        scope: sources_scope,
+        url: GetBasePath('inventory_sources'),
+        field: 'source_regions',
+        variable: 'rax_regions',
+        choice_name: 'rax_region_choices',
+        callback: 'choicesReadyGroup'
+    });
+
+    GetChoices({
+        scope: sources_scope,
+        url: GetBasePath('inventory_sources'),
+        field: 'source_regions',
+        variable: 'ec2_regions',
+        choice_name: 'ec2_region_choices',
+        callback: 'choicesReadyGroup'
+    });
+
+    GetChoices({
+        scope: sources_scope,
+        url: GetBasePath('inventory_sources'),
+        field: 'source_regions',
+        variable: 'gce_regions',
+        choice_name: 'gce_region_choices',
+        callback: 'choicesReadyGroup'
+    });
+
+    GetChoices({
+        scope: sources_scope,
+        url: GetBasePath('inventory_sources'),
+        field: 'source_regions',
+        variable: 'azure_regions',
+        choice_name: 'azure_region_choices',
+        callback: 'choicesReadyGroup'
+    });
+
+    // Load options for group_by
+    GetChoices({
+        scope: sources_scope,
+        url: GetBasePath('inventory_sources'),
+        field: 'group_by',
+        variable: 'ec2_group_by',
+        choice_name: 'ec2_group_by_choices',
+        callback: 'choicesReadyGroup'
+    });
+
+    //Wait('start');
+
+    if (parent_scope.removeAddTreeRefreshed) {
+        parent_scope.removeAddTreeRefreshed();
+    }
+    parent_scope.removeAddTreeRefreshed = parent_scope.$on('GroupTreeRefreshed', function() {
+        // Clean up
+        Wait('stop');
+
+        if (modal_scope.searchCleanUp) {
+            modal_scope.searchCleanup();
+        }
+        try {
+            //$('#group-modal-dialog').dialog('close');
+        } catch (e) {
+            // ignore
+        }
+    });
+
+    if (modal_scope.removeSaveComplete) {
+        modal_scope.removeSaveComplete();
+    }
+    modal_scope.removeSaveComplete = modal_scope.$on('SaveComplete', function(e, error) {
+        if (!error) {
+            modal_scope.cancelPanel();
+        }
+    });
+
+    if (modal_scope.removeFormSaveSuccess) {
+        modal_scope.removeFormSaveSuccess();
+    }
+    modal_scope.removeFormSaveSuccess = modal_scope.$on('formSaveSuccess', function() {
+
+        // Source data gets stored separately from the group. Validate and store Source
+        // related fields, then call SaveComplete to wrap things up.
+
+        var parseError = false,
+            regions, r, i,
+            group_by,
+            data = {
+                group: group_id,
+                source: ((sources_scope.source && sources_scope.source.value !== 'manual') ? sources_scope.source.value : ''),
+                source_path: sources_scope.source_path,
+                credential: sources_scope.credential,
+                overwrite: sources_scope.overwrite,
+                overwrite_vars: sources_scope.overwrite_vars,
+                source_script: sources_scope.inventory_script,
+                update_on_launch: sources_scope.update_on_launch,
+                update_cache_timeout: (sources_scope.update_cache_timeout || 0)
+            };
+
+        // Create a string out of selected list of regions
+        if (sources_scope.source_regions) {
+            regions = $('#source_source_regions').select2("data");
+            r = [];
+            for (i = 0; i < regions.length; i++) {
+                r.push(regions[i].id);
+            }
+            data.source_regions = r.join();
+        }
+
+        if (sources_scope.source && (sources_scope.source.value === 'ec2')) {
+            data.instance_filters = sources_scope.instance_filters;
+            // Create a string out of selected list of regions
+            group_by = $('#source_group_by').select2("data");
+            r = [];
+            for (i = 0; i < group_by.length; i++) {
+                r.push(group_by[i].id);
+            }
+            data.group_by = r.join();
+        }
+
+        if (sources_scope.source && (sources_scope.source.value === 'ec2')) {
+            // for ec2, validate variable data
+            data.source_vars = ToJSON(sources_scope.envParseType, sources_scope.source_vars, true);
+        }
+
+        if (sources_scope.source && (sources_scope.source.value === 'custom')) {
+            data.source_vars = ToJSON(sources_scope.envParseType, sources_scope.extra_vars, true);
+        }
+
+        if (sources_scope.source && (sources_scope.source.value === 'vmware' ||
+                sources_scope.source.value === 'openstack')) {
+            data.source_vars = ToJSON(sources_scope.envParseType, sources_scope.inventory_variables, true);
+        }
+
+        // the API doesn't expect the credential to be passed with a custom inv script
+        if (sources_scope.source && sources_scope.source.value === 'custom') {
+            delete(data.credential);
+        }
+
+        if (!parseError) {
+            Rest.setUrl(sources_scope.source_url);
+            Rest.put(data)
+                .success(function() {
+                    modal_scope.$emit('SaveComplete', false);
+                })
+                .error(function(data, status) {
+                    $('#group_tabs a:eq(1)').tab('show');
+                    ProcessErrors(sources_scope, data, status, SourceForm, {
+                        hdr: 'Error!',
+                        msg: 'Failed to update group inventory source. PUT status: ' + status
+                    });
+                });
+        }
+    });
+
+    // Cancel
+    modal_scope.cancelPanel = function() {
+        Wait('stop');
+        $state.go('inventoryManage', {}, {reload: true})
+    };
+
+    // Save
+    modal_scope.saveGroup = function() {
+        Wait('start');
+        var fld, data, json_data;
+
+        try {
+
+            json_data = ToJSON(properties_scope.parseType, properties_scope.variables, true);
+
+            data = {};
+            for (fld in GroupForm.fields) {
+                data[fld] = properties_scope[fld];
+            }
+
+            data.inventory = inventory_id;
+
+            Rest.setUrl(defaultUrl);
+            if (mode === 'edit' || (mode === 'add' && group_created)) {
+                Rest.put(data)
+                    .success(function() {
+                        modal_scope.$emit('formSaveSuccess');
+                    })
+                    .error(function(data, status) {
+                        $('#group_tabs a:eq(0)').tab('show');
+                        ProcessErrors(properties_scope, data, status, GroupForm, {
+                            hdr: 'Error!',
+                            msg: 'Failed to update group: ' + group_id + '. PUT status: ' + status
+                        });
+                    });
+            } else {
+                Rest.post(data)
+                    .success(function(data) {
+                        group_created = true;
+                        group_id = data.id;
+                        sources_scope.source_url = data.related.inventory_source;
+                        modal_scope.$emit('formSaveSuccess');
+                    })
+                    .error(function(data, status) {
+                        $('#group_tabs a:eq(0)').tab('show');
+                        ProcessErrors(properties_scope, data, status, GroupForm, {
+                            hdr: 'Error!',
+                            msg: 'Failed to create group: ' + group_id + '. POST status: ' + status
+                        });
+                    });
+            }
+        } catch (e) {
+            // ignore. ToJSON will have already alerted the user
+        }
+    };
+
+    // Start the update process
+    modal_scope.updateGroup = function() {
+        if (sources_scope.source === "manual" || sources_scope.source === null) {
+            Alert('Missing Configuration', 'The selected group is not configured for updates. You must first edit the group, provide Source settings, ' +
+                'and then run an update.', 'alert-info');
+        } else if (sources_scope.status === 'updating') {
+            Alert('Update in Progress', 'The inventory update process is currently running for group <em>' +
+                $filter('sanitize')(sources_scope.summary_fields.group.name) + '</em>. Use the Refresh button to monitor the status.', 'alert-info', null, null, null, null, true);
+        } else {
+            InventoryUpdate({
+                scope: parent_scope,
+                group_id: group_id,
+                url: properties_scope.group_update_url,
+                group_name: properties_scope.name,
+                group_source: sources_scope.source.value
+            });
+        }
+    };
+
+    // Change the lookup and regions when the source changes
+    sources_scope.sourceChange = function() {
+        sources_scope.credential_name = "";
+        sources_scope.credential = "";
+        if (sources_scope.credential_name_api_error) {
+            delete sources_scope.credential_name_api_error;
+        }
+        initSourceChange();
+    };
+
+
+    angular.extend(vm, {
+        cancelPanel : modal_scope.cancelPanel,
+        saveGroup: modal_scope.saveGroup
+    })
+}
+
+export default ['$filter', '$rootScope', '$location', '$log', '$stateParams', '$compile', '$state', '$scope', 'Rest', 'Alert', 'GroupForm', 'GenerateForm',
+    'Prompt', 'ProcessErrors', 'GetBasePath', 'SetNodeName', 'ParseTypeChange', 'GetSourceTypeOptions', 'InventoryUpdate',
+    'LookUpInit', 'Empty', 'Wait', 'GetChoices', 'UpdateGroup', 'SourceChange', 'Find',
+    'ParseVariableString', 'ToJSON', 'GroupsScheduleListInit', 'SourceForm', 'SetSchedulesInnerDialogSize', 'CreateSelect2', 'ParamPass',
+    manageGroupsDirectiveController
+];
diff --git a/awx/ui/client/src/inventories/manage/manage-groups/directive/manage-groups.directive.js b/awx/ui/client/src/inventories/manage/manage-groups/directive/manage-groups.directive.js
new file mode 100644
index 0000000000..b4c3fbff73
--- /dev/null
+++ b/awx/ui/client/src/inventories/manage/manage-groups/directive/manage-groups.directive.js
@@ -0,0 +1,25 @@
+/*************************************************
+ * Copyright (c) 2015 Ansible, Inc.
+ *
+ * All Rights Reserved
+ *************************************************/
+
+/* jshint unused: vars */
+import manageGroupsDirectiveController from './manage-groups.directive.controller';
+
+export default ['templateUrl', 'ParamPass',
+    function(templateUrl, ParamPass) {
+        return {
+            restrict: 'EA',
+            scope: true,
+            replace: true,
+            templateUrl: templateUrl('inventories/manage/manage-groups/directive/manage-groups.directive'),
+            link: function(scope, element, attrs) {
+
+            },
+            controller: manageGroupsDirectiveController,
+            controllerAs: 'vm',
+            bindToController: true
+        };
+    }
+];
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
new file mode 100644
index 0000000000..86368afbe4
--- /dev/null
+++ b/awx/ui/client/src/inventories/manage/manage-groups/directive/manage-groups.directive.partial.html
@@ -0,0 +1,18 @@
+<div>
+    <div class="Form-exitHolder">
+        <button class="Form-exit" ng-click="vm.cancelPanel()">
+            <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 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()">
+                Cancel</button>
+        </div>
+    </div>
+</div>
diff --git a/awx/ui/client/src/inventories/manage/manage-groups/main.js b/awx/ui/client/src/inventories/manage/manage-groups/main.js
new file mode 100644
index 0000000000..b015b64628
--- /dev/null
+++ b/awx/ui/client/src/inventories/manage/manage-groups/main.js
@@ -0,0 +1,16 @@
+/*************************************************
+ * Copyright (c) 2015 Ansible, Inc.
+ *
+ * All Rights Reserved
+ *************************************************/
+
+import route from './manage-groups.route';
+import manageGroupsDirective from './directive/manage-groups.directive';
+
+export default
+    angular.module('manage-groups', [])
+    .directive('manageGroups', manageGroupsDirective)
+        .run(['$stateExtender', function($stateExtender) {
+            $stateExtender.addState(route.edit);
+            $stateExtender.addState(route.add);
+        }]);
diff --git a/awx/ui/client/src/inventories/manage/manage-groups/manage-groups.controller.html b/awx/ui/client/src/inventories/manage/manage-groups/manage-groups.controller.html
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/awx/ui/client/src/inventories/manage/manage-groups/manage-groups.directive.html b/awx/ui/client/src/inventories/manage/manage-groups/manage-groups.directive.html
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/awx/ui/client/src/inventories/manage/manage-groups/manage-groups.partial.html b/awx/ui/client/src/inventories/manage/manage-groups/manage-groups.partial.html
index e69de29bb2..e39e0984ac 100644
--- a/awx/ui/client/src/inventories/manage/manage-groups/manage-groups.partial.html
+++ b/awx/ui/client/src/inventories/manage/manage-groups/manage-groups.partial.html
@@ -0,0 +1,5 @@
+<div class="tab-pane" id="Inventory-groupManage">
+  <div ng-cloak id="Inventory-groupManage--panel" class="Panel">
+      <manage-groups></manage-groups>
+  </div>
+</div>
diff --git a/awx/ui/client/src/inventories/manage/manage-groups/manage-groups.route.js b/awx/ui/client/src/inventories/manage/manage-groups/manage-groups.route.js
new file mode 100644
index 0000000000..e83c934ea9
--- /dev/null
+++ b/awx/ui/client/src/inventories/manage/manage-groups/manage-groups.route.js
@@ -0,0 +1,46 @@
+/*************************************************
+ * Copyright (c) 2016 Ansible, Inc.
+ *
+ * All Rights Reserved
+ *************************************************/
+import {
+    templateUrl
+} from '../../../shared/template-url/template-url.factory';
+
+export default {
+    edit: {
+        name: 'inventoryManage.editGroup',
+        route: '/:group_id/editGroup',
+        templateUrl: templateUrl('inventories/manage/manage-groups/manage-groups'),
+        data: {
+            group_id: 'group_id',
+            mode: 'edit'
+        },
+        ncyBreadcrumb: {
+            label: "INVENTORY EDIT GROUPS"
+        },
+        resolve: {
+            features: ['FeaturesService', function(FeaturesService) {
+                return FeaturesService.get();
+            }]
+        }
+    },
+
+    add: {
+        name: 'inventoryManage.addGroup',
+        route: '/addGroup',
+        templateUrl: templateUrl('inventories/manage/manage-groups/manage-groups'),
+        ncyBreadcrumb: {
+            label: "INVENTORY ADD GROUP"
+        },
+        data: {
+            mode: 'add'
+        },
+        resolve: {
+            features: ['FeaturesService', function(FeaturesService) {
+                return FeaturesService.get();
+            }]
+        }
+    },
+
+};
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
new file mode 100644
index 0000000000..1fdf0d157a
--- /dev/null
+++ b/awx/ui/client/src/inventories/manage/manage-hosts/directive/manage-hosts.directive.controller.js
@@ -0,0 +1,186 @@
+/*************************************************
+ * Copyright (c) 2016 Ansible, Inc.
+ *
+ * All Rights Reserved
+ *************************************************/
+
+function manageHostsDirectiveController($rootScope, $location, $log, $stateParams, $state, $scope, Rest, Alert, HostForm,
+    GenerateForm, Prompt, ProcessErrors, GetBasePath, HostsReload, ParseTypeChange, Wait,
+    Find, SetStatus, ApplyEllipsis, ToJSON, ParseVariableString, CreateDialog, TextareaResize, ParamPass) {
+
+    var vm = this;
+
+    var params = ParamPass.get();
+    if(params === undefined) {
+        params = {};
+        params.host_scope = $scope.$new();
+        params.group_scope = $scope.$new();
+    }
+    var parent_scope = params.host_scope,
+        group_scope = params.group_scope,
+        inventory_id = $stateParams.inventory_id,
+        mode = $state.current.data.mode, // 'add' or 'edit'
+        selected_group_id = params.selected_group_id,
+        generator = GenerateForm,
+        form = HostForm,
+        defaultUrl,
+        scope = parent_scope.$new(),
+        master = {},
+        relatedSets = {},
+        url, form_scope;
+
+        var host_id = $stateParams.host_id || undefined;
+
+    form_scope =
+        generator.inject(HostForm, {
+            mode: 'edit',
+            id: 'host-panel-form',
+            related: false,
+            scope: scope,
+            cancelButton: false
+        });
+    generator.reset();
+
+    var name = scope.name;
+    scope.parseType = 'yaml';
+
+    // Retrieve detail record and prepopulate the form
+    if (mode === 'edit') {
+        defaultUrl = GetBasePath('hosts') + host_id + '/';
+        Rest.setUrl(defaultUrl);
+        Rest.get()
+            .success(function(data) {
+                var set, fld, related;
+                for (fld in form.fields) {
+                    if (data[fld]) {
+                        scope[fld] = data[fld];
+                        master[fld] = scope[fld];
+                    }
+                }
+                related = data.related;
+                for (set in form.related) {
+                    if (related[set]) {
+                        relatedSets[set] = {
+                            url: related[set],
+                            iterator: form.related[set].iterator
+                        };
+                    }
+                }
+                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, {
+                    hdr: 'Error!',
+                    msg: 'Failed to retrieve host: ' + host_id + '. GET returned status: ' + status
+                });
+            });
+    } else {
+        if (selected_group_id) {
+            // adding hosts to a group
+            url = GetBasePath('groups') + selected_group_id + '/';
+        } else {
+            // adding hosts to the top-level (inventory)
+            url = GetBasePath('inventory') + inventory_id + '/';
+        }
+        // Add mode
+        Rest.setUrl(url);
+        Rest.get()
+            .success(function(data) {
+                scope.has_inventory_sources = data.has_inventory_sources;
+                scope.enabled = true;
+                scope.variables = '---';
+                defaultUrl = data.related.hosts;
+                //scope.$emit('hostVariablesLoaded');
+            })
+            .error(function(data, status) {
+                ProcessErrors(parent_scope, data, status, form, {
+                    hdr: 'Error!',
+                    msg: 'Failed to retrieve group: ' + selected_group_id + '. GET returned status: ' + status
+                });
+            });
+    }
+
+    if (scope.removeSaveCompleted) {
+        scope.removeSaveCompleted();
+    }
+    scope.removeSaveCompleted = scope.$on('saveCompleted', function() {
+        Wait('stop');
+        try {
+            $('#host-modal-dialog').dialog('close');
+        } catch (err) {
+            // ignore
+        }
+        if (group_scope && group_scope.refreshHosts) {
+            group_scope.refreshHosts();
+        }
+        if (parent_scope.refreshHosts) {
+            parent_scope.refreshHosts();
+        }
+        scope.$destroy();
+        $state.go('inventoryManage', {}, {
+            reload: true
+        });
+    });
+
+    // Save changes to the parent
+    var saveHost = function() {
+        Wait('start');
+        var fld, data = {};
+
+        try {
+            data.variables = ToJSON(scope.parseType, scope.variables, true);
+            for (fld in form.fields) {
+                data[fld] = scope[fld];
+            }
+            data.inventory = inventory_id;
+            Rest.setUrl(defaultUrl);
+            if (mode === 'edit') {
+                Rest.put(data)
+                    .success(function() {
+                        scope.$emit('saveCompleted');
+                    })
+                    .error(function(data, status) {
+                        ProcessErrors(scope, data, status, form, {
+                            hdr: 'Error!',
+                            msg: 'Failed to update host: ' + host_id + '. PUT returned status: ' + status
+                        });
+                    });
+            } else {
+                Rest.post(data)
+                    .success(function() {
+                        scope.$emit('saveCompleted');
+                    })
+                    .error(function(data, status) {
+                        ProcessErrors(scope, data, status, form, {
+                            hdr: 'Error!',
+                            msg: 'Failed to create host. POST returned status: ' + status
+                        });
+                    });
+            }
+        } catch (e) {
+            // ignore. ToJSON will have already alerted the user
+        }
+    };
+
+    var cancelPanel = function() {
+        scope.$destroy();
+        if (scope.codeMirror) {
+            scope.codeMirror.destroy();
+        }
+        $state.go('inventoryManage');
+    };
+
+    angular.extend(vm, {
+        cancelPanel: cancelPanel,
+        name: name,
+        saveHost: saveHost,
+    });
+}
+
+export default ['$rootScope', '$location', '$log', '$stateParams', '$state', '$scope', 'Rest', 'Alert', 'HostForm',
+    'GenerateForm', 'Prompt', 'ProcessErrors', 'GetBasePath', 'HostsReload', 'ParseTypeChange',
+    'Wait', 'Find', 'SetStatus', 'ApplyEllipsis', 'ToJSON', 'ParseVariableString',
+    'CreateDialog', 'TextareaResize', 'ParamPass', manageHostsDirectiveController
+];
diff --git a/awx/ui/client/src/inventories/manage/manage-hosts/manage-hosts.directive.js b/awx/ui/client/src/inventories/manage/manage-hosts/directive/manage-hosts.directive.js
similarity index 57%
rename from awx/ui/client/src/inventories/manage/manage-hosts/manage-hosts.directive.js
rename to awx/ui/client/src/inventories/manage/manage-hosts/directive/manage-hosts.directive.js
index 734d043019..ac10ea1dfd 100644
--- a/awx/ui/client/src/inventories/manage/manage-hosts/manage-hosts.directive.js
+++ b/awx/ui/client/src/inventories/manage/manage-hosts/directive/manage-hosts.directive.js
@@ -5,21 +5,21 @@
  *************************************************/
 
 /* jshint unused: vars */
-import manageHostsController from './manage-hosts.controller';
+import manageHostsDirectiveController from './manage-hosts.directive.controller';
 
-export default ['templateUrl',
-    function(templateUrl) {
+export default ['templateUrl', 'ParamPass',
+    function(templateUrl, ParamPass) {
         return {
             restrict: 'EA',
             scope: true,
             replace: true,
-            templateUrl: templateUrl('inventories/manage/manage-hosts/manage-hosts'),
+            templateUrl: templateUrl('inventories/manage/manage-hosts/directive/manage-hosts.directive'),
             link: function(scope, element, attrs) {
 
             },
-           controller: manageHostsController,
-           controllerAs: 'vm',
-           bindToController: true
+            controller: manageHostsDirectiveController,
+            controllerAs: 'vm',
+            bindToController: true
         };
     }
 ];
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
new file mode 100644
index 0000000000..7ebdcbbf8d
--- /dev/null
+++ b/awx/ui/client/src/inventories/manage/manage-hosts/directive/manage-hosts.directive.partial.html
@@ -0,0 +1,17 @@
+<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>
+</div>
diff --git a/awx/ui/client/src/inventories/manage/manage-hosts/main.js b/awx/ui/client/src/inventories/manage/manage-hosts/main.js
index 3815d1bc98..e90954f2de 100644
--- a/awx/ui/client/src/inventories/manage/manage-hosts/main.js
+++ b/awx/ui/client/src/inventories/manage/manage-hosts/main.js
@@ -5,9 +5,12 @@
  *************************************************/
 
 import route from './manage-hosts.route';
+import manageHostsDirective from './directive/manage-hosts.directive';
 
 export default
-    angular.module('manageHosts', [])
+    angular.module('manage-hosts', [])
+    .directive('manageHosts', manageHostsDirective)
         .run(['$stateExtender', function($stateExtender) {
-            $stateExtender.addState(route);
+            $stateExtender.addState(route.edit);
+            $stateExtender.addState(route.add);
         }]);
diff --git a/awx/ui/client/src/inventories/manage/manage-hosts/manage-hosts.controller.js b/awx/ui/client/src/inventories/manage/manage-hosts/manage-hosts.controller.js
deleted file mode 100644
index 3f38abfaaf..0000000000
--- a/awx/ui/client/src/inventories/manage/manage-hosts/manage-hosts.controller.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/*************************************************
- * Copyright (c) 2015 Ansible, Inc.
- *
- * All Rights Reserved
- *************************************************/
-
-function manageHostDirectiveController($q, $rootScope, $scope, $state,
-    $stateParams, $compile, ScopePass, Rest, ProcessErrors,
-    CreateDialog, GetBasePath, Wait, GenerateList, GroupList, SearchInit,
-    PaginateInit, GetRootGroups) {
-
-    var vm = this;
-    console.info(ScopePass);
-
-};
-
-export default ['$q', '$rootScope', '$scope', '$state', '$stateParams',
-    'ScopePass', '$compile', 'ScopePass', 'Rest', 'ProcessErrors', 'CreateDialog',
-    'GetBasePath', 'Wait', 'generateList', 'GroupList', 'SearchInit',
-    'PaginateInit', 'GetRootGroups',
-    manageHostDirectiveController
-];
diff --git a/awx/ui/client/src/inventories/manage/manage-hosts/manage-hosts.partial.html b/awx/ui/client/src/inventories/manage/manage-hosts/manage-hosts.partial.html
index a8016b0ba6..f145702511 100644
--- a/awx/ui/client/src/inventories/manage/manage-hosts/manage-hosts.partial.html
+++ b/awx/ui/client/src/inventories/manage/manage-hosts/manage-hosts.partial.html
@@ -1,2 +1,5 @@
-<div class="manage-hosts">This is the manage hosts directive.
-    </div>
+<div class="tab-pane" id="Inventory-hostManage">
+  <div ng-cloak id="Inventory-hostManage--panel" class="Panel">
+      <manage-hosts></manage-hosts>
+  </div>
+</div>
diff --git a/awx/ui/client/src/inventories/manage/manage-hosts/manage-hosts.route.js b/awx/ui/client/src/inventories/manage/manage-hosts/manage-hosts.route.js
index ec9679fccb..8e97578aa5 100644
--- a/awx/ui/client/src/inventories/manage/manage-hosts/manage-hosts.route.js
+++ b/awx/ui/client/src/inventories/manage/manage-hosts/manage-hosts.route.js
@@ -3,35 +3,44 @@
  *
  * All Rights Reserved
  *************************************************/
-
-// import {
-//     templateUrl
-// } from '../../../shared/template-url/template-url.factory';
-
-import manageHostDirectiveController from './manage-hosts.controller'
+import {
+    templateUrl
+} from '../../../shared/template-url/template-url.factory';
 
 export default {
-    name: 'inventoryManage.manageHosts',
-    route: '/managehosts',
-    //template: '<div>SOMETHING</div>',
-    views: {
-        "manage@inventoryManage" : {
-            template: '<div>the template from route</div>'
+    edit: {
+        name: 'inventoryManage.editHost',
+        route: '/:host_id/editHost',
+        templateUrl: templateUrl('inventories/manage/manage-hosts/manage-hosts'),
+        data: {
+            host_id: 'host_id',
+            mode: 'edit'
+        },
+        ncyBreadcrumb: {
+            label: "INVENTORY EDIT HOSTS"
+        },
+        resolve: {
+            features: ['FeaturesService', function(FeaturesService) {
+                return FeaturesService.get();
+            }]
         }
     },
 
-    // data: {
-    //     activityStream: true,
-    //     activityStreamTarget: 'inventory',
-    //     activityStreamId: 'inventory_id'
-    // },
-    ncyBreadcrumb: {
-        label: "INVENTORY MANAGE"
+    add: {
+        name: 'inventoryManage.addHost',
+        route: '/addHost',
+        templateUrl: templateUrl('inventories/manage/manage-hosts/manage-hosts'),
+        data: {
+            mode: 'add'
+        },
+        ncyBreadcrumb: {
+            label: "INVENTORY ADD HOST"
+        },
+        resolve: {
+            features: ['FeaturesService', function(FeaturesService) {
+                return FeaturesService.get();
+            }]
+        }
     },
-    controller: manageHostDirectiveController,
-    // resolve: {
-    //     features: ['FeaturesService', function(FeaturesService) {
-    //         return FeaturesService.get();
-    //     }]
-    // },
+
 };
diff --git a/awx/ui/client/src/inventories/manage/manage.block.less b/awx/ui/client/src/inventories/manage/manage.block.less
new file mode 100644
index 0000000000..46598719be
--- /dev/null
+++ b/awx/ui/client/src/inventories/manage/manage.block.less
@@ -0,0 +1,6 @@
+#Inventory-groupManage--panel, #Inventory-hostManage--panel {
+    .ui-dialog-buttonpane.ui-widget-content {
+        border: none;
+        text-align: right;
+    }
+}
diff --git a/awx/ui/client/src/shared/Utilities.js b/awx/ui/client/src/shared/Utilities.js
index 3190bb775e..a662c7c139 100644
--- a/awx/ui/client/src/shared/Utilities.js
+++ b/awx/ui/client/src/shared/Utilities.js
@@ -872,15 +872,15 @@ angular.module('Utilities', ['RestServices', 'Utilities', 'sanitizeFilter'])
         };
     }
 ])
-.factory('ScopePass', function() {
-    var savedData = {}
+.factory('ParamPass', function() {
+    var savedData = undefined;
 
     function set(data) {
         savedData = data;
     }
 
     function get() {
-        return savedData; 
+        return savedData;
     }
 
     return {
diff --git a/awx/ui/client/src/shared/form-generator.js b/awx/ui/client/src/shared/form-generator.js
index 693a090f68..5b45fff729 100644
--- a/awx/ui/client/src/shared/form-generator.js
+++ b/awx/ui/client/src/shared/form-generator.js
@@ -1394,13 +1394,18 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
                         "ng-if=is_superuser>Admin</span>";
                 }
                 html += "</div>\n";
+                if(options.cancelButton !== undefined && options.cancelButton === false) {
+                    html += "<div class=\"Form-exitHolder\">";
+                    html += "</div>";
+                } else {
+                    html += "<div class=\"Form-exitHolder\">";
+                    html += "<button class=\"Form-exit\" ng-click=\"formCancel()\">";
+                    html += "<i class=\"fa fa-times-circle\"></i>";
+                    html += "</button></div>\n";
+                }
+                    html += "</div>\n"; //end of Form-header
 
-                html += "<div class=\"Form-exitHolder\">";
-                html += "<button class=\"Form-exit\" ng-click=\"formCancel()\">";
-                html += "<i class=\"fa fa-times-circle\"></i>";
-                html += "</button></div>\n";
 
-                html += "</div>\n"; //end of Form-header
 
                 if (this.form.tabs) {
                     var collection;