diff --git a/awx/ui/static/js/lists/Groups.js b/awx/ui/static/js/lists/Groups.js
index 0edb606ded..c0e92d600e 100644
--- a/awx/ui/static/js/lists/Groups.js
+++ b/awx/ui/static/js/lists/Groups.js
@@ -38,7 +38,6 @@ angular.module('GroupListDefinition', [])
                 'class': 'btn-xs btn-info btn-help pull-right',
                 awToolTip: 'Click for help',
                 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 1972467d08..5a363969e0 100644
--- a/awx/ui/static/js/lists/Hosts.js
+++ b/awx/ui/static/js/lists/Hosts.js
@@ -38,8 +38,7 @@ angular.module('HostListDefinition', [])
                 'class': 'btn-xs btn-info btn-help',
                 awToolTip: 'Click for help',
                 dataTitle: 'Selecting Hosts',
-                iconSize: 'large',
-                id: 'host-help-button'
+                iconSize: 'large'
                 }
             },
 
diff --git a/awx/ui/static/js/lists/Projects.js b/awx/ui/static/js/lists/Projects.js
index 1abda9fc2b..53e5142b38 100644
--- a/awx/ui/static/js/lists/Projects.js
+++ b/awx/ui/static/js/lists/Projects.js
@@ -71,8 +71,7 @@ angular.module('ProjectsListDefinition', [])
                 'class': 'btn-xs btn-info btn-help pull-right',
                 awToolTip: 'Click for help',
                 dataTitle: 'Project Status',
-                iconSize: 'large',
-                id: 'project-help-button'
+                iconSize: 'large'
                 }
             },
 
diff --git a/awx/ui/static/lib/ansible/form-generator.js b/awx/ui/static/lib/ansible/form-generator.js
index f06b020f50..93f178f7e2 100644
--- a/awx/ui/static/lib/ansible/form-generator.js
+++ b/awx/ui/static/lib/ansible/form-generator.js
@@ -887,7 +887,7 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies'])
              var act;
              for (action in this.form.statusActions) {
                  act = this.form.statusActions[action];
-                 html += this.button(act);
+                 html += this.button(act, action);
              }
              //html += "</div>\n";
              //html += "<div class=\"status-spin\"><i class=\"icon-spinner icon-spin\" ng-show=\"statusSearchSpin == true\"></i></div>\n";
@@ -1153,19 +1153,14 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies'])
           html += "<div class=\"tree-container\">\n";      
           html += "<div class=\"tree-controls\">\n";
           html += "<div class=\"title col-lg-2\" ng-bind=\"selectedNodeName\"></div>\n";
-          //html += "<button type=\"button\" class=\"btn btn-default btn-xs\" ng-click=\"editInventory()\" ng-hide=\"inventoryEditHide\" " +
-          //    "aw-tool-tip=\"Edit inventory properties\"  data-placement=\"bottom\"><i class=\"icon-edit\"></i> " +
-          //    "Inventory Properties</button>\n";
-          html += "<button type=\"button\" class=\"btn btn-default btn-sm\" ng-click=\"editGroup()\" ng-hide=\"groupEditHide\" " +
+          html += "<button type=\"button\" id=\"edit_group_btn\" class=\"btn btn-default btn-sm\" ng-click=\"editGroup()\" ng-hide=\"groupEditHide\" " +
               "aw-tool-tip=\"Edit the selected group's properties\" data-placement=\"bottom\"><i class=\"icon-edit\"></i> " +
               "Properties</button>\n";
-          //html += "<button type=\"button\" class=\"btn btn-default btn-xs\" ng-click=\"editHosts()\" ng-hide=\"showGroupHelp\" " +
-          //    "aw-tool-tip=\"Modify and create inventory hosts\" data-placement=\"bottom\"><i class=\"icon-laptop\"></i> Hosts</button>\n";
-          html += "<button type=\"button\" class=\"btn btn-success btn-sm\" ng-click=\"addGroup()\" ng-hide=\"groupAddHide\" " +
+          html += "<button type=\"button\" id=\"copy_group_btn\" class=\"btn btn-success btn-sm\" ng-click=\"addGroup()\" ng-hide=\"groupAddHide\" " +
               "aw-tool-tip=\"Copy existing groups to the selected group\" data-placement=\"bottom\"><i class=\"icon-check\"></i> Copy</button>\n";
-          html += "<button type=\"button\" class=\"btn btn-success btn-sm\" ng-click=\"createGroup()\" ng-hide=\"groupCreateHide\" " +
+          html += "<button type=\"button\" id=\"create_group_btn\" class=\"btn btn-success btn-sm\" ng-click=\"createGroup()\" ng-hide=\"groupCreateHide\" " +
               "aw-tool-tip=\"Create a brand new group and add it to the selected group\" data-placement=\"bottom\"><i class=\"icon-plus\"></i> Create New</button>\n";
-          html += "<button type=\"button\" class=\"btn btn-danger btn-sm\" ng-click=\"deleteGroup()\" ng-hide=\"groupDeleteHide\" " +
+          html += "<button type=\"button\" id=\"delete_group_btn\" class=\"btn btn-danger btn-sm\" ng-click=\"deleteGroup()\" ng-hide=\"groupDeleteHide\" " +
               "aw-tool-tip=\"Permanently delete the selected group. Any hosts in the group will still be available in All Hosts.\" " +
               "data-placement=\"bottom\"><i class=\"icon-trash\"></i> Delete</button>\n";
           html += "</div><!-- tree controls -->\n";
@@ -1192,9 +1187,6 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies'])
           html += "<div class=\"col-lg-3\" id=\"search-tree-target\">\n";
           html += "<div class=\"search-tree well\">\n";
           html += "<div id=\"search-tree-container\">\n</div><!-- search-tree-container -->\n";
-          //html += "<div class=\"text-right pad-right-sm\"><button type=\"button\" class=\"btn btn-default btn-xs\" " +
-          //    "ng-click=\"editGroups()\" aw-tool-tip=\"Modify and create inventory groups\" data-placement=\"left\"> " +
-          //    "<i class=\"icon-sitemap\"></i> Groups</button></div>\n";
           html += "</div><!-- search-tree well -->\n";
           html += "</div><!-- col-lg-3 -->\n";
           html += "<div class=\"col-lg-9\">\n"; 
@@ -1204,6 +1196,7 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies'])
           html += "<div class=\"hosts-well well\">\n";
 
           html += SearchWidget({ iterator: form.iterator, template: form, mini: true, size: 'col-md-6 col-lg-6'});
+          
           html += "<div class=\"col-md-5 col-lg-5\">\n"
           html += "<div class=\"pull-right\">\n";
           // Add actions(s)
@@ -1211,7 +1204,12 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies'])
               html += "<button type=\"button\" class=\"btn ";
               html += (form.actions[action]['class']) ? form.actions[action]['class'] : "btn-success";
               html += "\" ";
-              html += (form['actions'][action].id) ? this.attr(form['actions'][action],'id') : "";
+              if (form['actions'][action].id) {
+                 html += this.attr(form['actions'][action],'id');
+              }
+              else {
+                 html += "id=\"" + action + "_btn\" ";
+              }
               html += this.attr(form['actions'][action],'ngClick');
               html += (form['actions'][action].awToolTip) ? this.attr(form['actions'][action],'awToolTip') : "";
               html += (form['actions'][action].awToolTip && form['actions'][action].dataPlacement) ? 
@@ -1229,13 +1227,10 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies'])
           
           // Start the list
           html += "<div class=\"list\">\n";
-          html += "<table class=\"" + form.iterator + " table table-condensed table-hover\">\n";
+          html += "<table id=\"hosts_table\" class=\"" + form.iterator + " table table-condensed table-hover\">\n";
           html += "<thead>\n";
           html += "<tr>\n";
           
-          //html += "<th><input type=\"checkbox\" ng-model=\"toggleAllFlag\" ng-change=\"toggleAllHosts()\" aw-tool-tip=\"Select all hosts\" " +
-          //    "data-placement=\"top\"></th>\n";
-          
           for (var fld in form.fields) {
               html += "<th class=\"list-header\" id=\"" + fld + "-header\" ";
               html += (!form.fields[fld].nosort) ? "ng-click=\"sort('"+ fld + "')\"" : "";
@@ -1280,11 +1275,11 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies'])
                  html += "<td>";
                  html += "<div class=\"input-group input-group-sm\">\n";
                  html += "<span class=\"input-group-btn\">\n";
-                 html += "<button class=\"btn btn-default\" type=\"button\" ng-click=\"editHostGroups({{ host.id }})\" " +
+                 html += "<button class=\"btn btn-default\" type=\"button\" id=\"edit_groups_btn\" ng-click=\"editHostGroups({{ host.id }})\" " +
                      "aw-tool-tip=\"Change group associations for this host\" data-placement=\"top\" >" + 
                      "<i class=\"icon-sitemap\"></i></button>\n";
                  html += "</span>\n";
-                 html += "<input type=\"text\" ng-model=\"host.groups\" class=\"form-control\" disabled=\"disabled\" >\n";
+                 html += "<input type=\"text\" id=\"host_groups\" ng-model=\"host.groups\" class=\"form-control\" disabled=\"disabled\" >\n";
                  html += "</div>\n";
                  html += "</td>\n";
               }
@@ -1297,7 +1292,9 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies'])
           html += "<td class=\"actions\">";
           for (act in form.fieldActions) {
              var action = form.fieldActions[act];
-             html += "<button type=\"button\" class=\"btn"; 
+             html += "<button type=\"button\" ";
+             html += "id=\"row_" + act + "_btn\" ";
+             html += "class=\"btn"; 
              html += (action['class']) ? " " + action['class'] : "";
              html += "\" " + this.attr(action,'ngClick');
              html += (action.awToolTip) ? this.attr(action,'awToolTip') : "";
@@ -1393,6 +1390,7 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies'])
                  html += "<button type=\"button\" class=\"btn btn-sm ";
                  html += (form.related[itm].actions[act]['class']) ? form.related[itm].actions[act]['class'] : "btn-success";
                  html += "\" ";
+                 html += "id=\"" + itm + "_" + act + "_btn\" ";
                  html += this.attr(action,'ngClick');
                  html += (action['ngShow']) ? this.attr(action,'ngShow') : "";
                  html += (action.awToolTip) ? this.attr(action,'awToolTip') : "";
@@ -1407,7 +1405,7 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies'])
 
               // Start the list
               html += "<div class=\"list\">\n";
-              html += "<table class=\"" + form.related[itm].iterator + " table table-condensed table-hover\">\n";
+              html += "<table id=\"" + itm + "_table" + "\" class=\"" + form.related[itm].iterator + " table table-condensed table-hover\">\n";
               html += "<thead>\n";
               html += "<tr>\n";
               html += (form.related[itm].index == undefined || form.related[itm].index !== false) ? "<th>#</th>\n" : "";
@@ -1456,6 +1454,7 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies'])
                  html += "<button type=\"button\" class=\"btn btn-xs"; 
                  html += (action['class']) ? " " + action['class'] : "";
                  html += "\" "; 
+                 html += "id=\"row" + action + "_btn\" ";
                  html += this.attr(action,'ngClick');
                  html += this.attr(action, 'ngShow');
                  html += (action.awToolTip) ? this.attr(action,'awToolTip') : "";
diff --git a/awx/ui/static/lib/ansible/generator-helpers.js b/awx/ui/static/lib/ansible/generator-helpers.js
index ee2d61a81a..9ed7f08dc8 100644
--- a/awx/ui/static/lib/ansible/generator-helpers.js
+++ b/awx/ui/static/lib/ansible/generator-helpers.js
@@ -95,7 +95,7 @@ angular.module('GeneratorHelpers', ['GeneratorHelpers'])
         })
 
     .factory('Button', ['Attr', function(Attr) {
-    return function(btn) {
+    return function(btn, action) {
         // pass in button object, get back html
         var html = '';
         if (btn.awRefresh) {
@@ -103,7 +103,8 @@ angular.module('GeneratorHelpers', ['GeneratorHelpers'])
            html += (btn.ngShow) ? Attr(btn, 'ngShow') : ""; 
            html += ">\n";
         }
-        html += "<button type=\"button\" " + "class=\"btn";
+        html += "<button type=\"button\" ";
+        html += "class=\"btn";
         if (btn.awRefresh && !btn['class']) {
             html += ' btn-primary btn-xs refresh-btn';
         }
@@ -117,7 +118,14 @@ angular.module('GeneratorHelpers', ['GeneratorHelpers'])
         html += "\" ";
         html += (btn.ngClick) ? Attr(btn, 'ngClick') : "";
         html += (btn.awRefresh) ? " ng-click=\"refreshCnt = " + $AnsibleConfig.refresh_rate + "; refresh()\" " : "";
-        html += (btn.id) ? "id=\"" + btn.id + "\" " : "";
+        if (btn.id) {
+           html += "id=\"" + btn.id + "\" ";
+        }
+        else {
+           if (action) {
+              html += "id=\"" + action + "_btn\" "; 
+           }
+        }
         html += (btn.ngHide) ? Attr(btn,'ngHide') : "";
         html += (btn.awToolTip) ? Attr(btn,'awToolTip') : "";
         html += (btn.awToolTip && btn.dataPlacement == undefined) ? "data-placement=\"top\" " : "";
@@ -163,7 +171,7 @@ angular.module('GeneratorHelpers', ['GeneratorHelpers'])
         var fld = params['fld'];
         var options = params['options'];
         var field;
-        
+
         if (params.type) {
            field = list[params.type][fld];
         }
@@ -171,13 +179,17 @@ angular.module('GeneratorHelpers', ['GeneratorHelpers'])
            field = list['fields'][fld];
         }
         
+        var name = field['label'].replace(/ /g,'_');
+
         html = (params.td == undefined || params.td !== false) ? "<td>\n" : "";
         html += "<div class=\"btn-group\">\n";
         html += "<button type=\"button\" ";
         html += (field.ngDisabled) ? "ng-disabled=\"" + field.ngDisabled + "\" " : "";
         html += "class=\"btn btn-default";
         html += (field['class']) ? " " + field['class'] : " btn-xs"; 
-        html += " dropdown-toggle\" data-toggle=\"dropdown\">";
+        html += " dropdown-toggle\" data-toggle=\"dropdown\" ";
+        html += "id=\"" + name + "_ddown\" ";  
+        html += ">";
         html += (field.icon) ? Icon(field.icon) : "";
         html += field.label;
         html += " <span class=\"caret\"></span></button>\n";
@@ -393,9 +405,11 @@ angular.module('GeneratorHelpers', ['GeneratorHelpers'])
         html += (useMini) ? " input-group-sm" : " input-group-sm";
         html += "\">\n";
         html += "<div class=\"input-group-btn\">\n";
-        html += "<button type=\"button\" class=\"btn "; 
-        // html += (useMini) ? "btn-mini " : "btn-small ";
-        html += "dropdown-toggle\" data-toggle=\"dropdown\">\n";
+        html += "<button type=\"button\" ";
+        html += "id=\"search_field_ddown\" ";
+        html += "class=\"btn "; 
+        html += "dropdown-toggle\" data-toggle=\"dropdown\" "
+        html += ">\n";
         html += "<span ng-bind=\"" + iterator + "SearchFieldLabel\"></span>\n";
         html += "<span class=\"caret\"></span>\n";
         html += "</button>\n";
@@ -411,19 +425,18 @@ angular.module('GeneratorHelpers', ['GeneratorHelpers'])
         html += "</ul>\n";
         html += "</div><!-- input-group-btn -->\n";
         
-        html += "<select ng-show=\"" + iterator + "SelectShow\" ng-model=\""+ iterator + "SearchSelectValue\" ng-change=\"search('" + iterator + "')\" ";
+        html += "<select id=\"search_value_select\" ng-show=\"" + iterator + "SelectShow\" ng-model=\""+ iterator + "SearchSelectValue\" ng-change=\"search('" + iterator + "')\" ";
         html += "ng-options=\"c.name for c in " + iterator + "SearchSelectOpts\" class=\"form-control search-select";
-        //html += (useMini) ? " input-sm" : "";
         html += "\"></select>\n";
 
-        html += "<input type=\"text\" ng-hide=\"" + iterator + "SelectShow || " + iterator + "InputHide\" class=\"form-control ";
-        //html += (useMini) ? " input-sm" : " input-sm";
+        html += "<input id=\"search_value_input\" type=\"text\" ng-hide=\"" + iterator + "SelectShow || " + iterator + "InputHide\" class=\"form-control ";
         html += "\" ng-model=\"" + iterator + "SearchValue\" ng-change=\"search('" + iterator + 
                 "')\" placeholder=\"Search\" type=\"text\" >\n";
         
         html += "<div class=\"input-group-btn\">\n";
-        html += "<button type=\"button\" ng-hide=\"" + iterator + "SelectShow || " + iterator + "HideSearchType || " + iterator + "InputHide\" class=\"btn ";
-        //html += (useMini) ? "btn-x " : "btn-small ";
+        html += "<button type=\"button\" ";
+        html += "id=\"search_option_ddown\" ";
+        html += "ng-hide=\"" + iterator + "SelectShow || " + iterator + "HideSearchType || " + iterator + "InputHide\" class=\"btn ";
         html += "dropdown-toggle\" data-toggle=\"dropdown\">\n";
         html += "<span ng-bind=\"" + iterator + "SearchTypeLabel\"></span>\n";
         html += "<span class=\"caret\"></span>\n";
@@ -461,10 +474,12 @@ angular.module('GeneratorHelpers', ['GeneratorHelpers'])
         html += "<form class=\"form-inline\">\n";
         html += "<button type=\"button\" class=\"previous btn btn-light";
         html += (useMini) ? " btn-xs\" " : "\" ";
+        html += "id=\"previous_page_btn\" ";
         html += "ng-click=\"prevSet('" + set + "','" + iterator + "')\" " +
                 "ng-disabled=\"" + iterator + "PrevUrl == null || " + iterator + "PrevUrl == undefined\"><i class=\"icon-caret-left\"></i> Prev</button>\n";
         html += "<button type=\"button\" class=\"next btn btn-light";
         html += (useMini) ? " btn-xs\" " : "\" ";
+        html += "id=\"next_page_btn\" ";
         html += " ng-click=\"nextSet('" + set + "','" + iterator + "')\"" + 
                 "ng-disabled=\"" + iterator + "NextUrl == null || " + iterator + "NextUrl == undefined\">Next <i class=\"icon-caret-right\"></i></button>\n";
         
@@ -472,6 +487,7 @@ angular.module('GeneratorHelpers', ['GeneratorHelpers'])
            html += "<label class=\"page-size-label\">Rows per page: </label>\n";
            html += "<select ng-model=\"" + iterator + "PageSize\" ng-change=\"changePageSize('" + 
                     set + "'," + "'" + iterator + "')\" ";
+           html += "id=\"page_size_select\" ";
            html += "class=\"page-size\">\n";
            html += "<option value=\"10\" selected>10</option>\n";
            html += "<option value=\"20\" selected>20</option>\n";
diff --git a/awx/ui/static/lib/ansible/list-generator.js b/awx/ui/static/lib/ansible/list-generator.js
index 006f429c1a..e5bbb8b5eb 100644
--- a/awx/ui/static/lib/ansible/list-generator.js
+++ b/awx/ui/static/lib/ansible/list-generator.js
@@ -152,14 +152,14 @@ angular.module('ListGenerator', ['GeneratorHelpers'])
               if (list.actions[action].mode == 'all' || list.actions[action].mode == options.mode) {
                  if ( (list.actions[action].basePaths == undefined) || 
                       (list.actions[action].basePaths && list.actions[action].basePaths.indexOf(base) > -1) ) {
-                    html += this.button(list.actions[action], list.iterator);
+                    html += this.button(list.actions[action], action);
                  }
               }
           }
           
           if (list.name == 'inventories' && options.mode !== 'select') {
               html += "<label class=\"checkbox-inline pull-right\"><input type=\"checkbox\" ng-model=\"inventoryFailureFilter\" " +
-                  "ng-change=\"search('inventory')\" > Show only inventories with failed jobs</label>\n";
+                  "ng-change=\"search('inventory')\" id=\"failed_jobs_chbox\"> Show only inventories with failed jobs</label>\n";
           }
 
           //select instructions
@@ -174,7 +174,7 @@ angular.module('ListGenerator', ['GeneratorHelpers'])
                  dataTitle: 'Help',
                  iconSize: 'large'
                  };
-             html += this.button(btn);
+             html += this.button(btn, 'select');
           }
        }
        else {
@@ -185,12 +185,14 @@ angular.module('ListGenerator', ['GeneratorHelpers'])
        html += "</div><!-- row -->\n";
          
        // table header row
-       html += "<table class=\"table"
+       html += "<table id=\"" + list.name + "_table\" ";
+       html += "class=\"table"
        html += (list['class']) ? " " + list['class'] : "";
        html += (options.mode == 'lookup' || options.id) ? ' table-hover-inverse' : '';
        html += (list.hover) ? ' table-hover' : '';
        
-       html += "\">\n";
+       html += "\" ";
+       html += ">\n";
        html += "<thead>\n";
        html += "<tr>\n";
        if (list.index) {
diff --git a/awx/ui/static/lib/ansible/prompt-dialog.js b/awx/ui/static/lib/ansible/prompt-dialog.js
index a7a1eac79a..6911079e73 100644
--- a/awx/ui/static/lib/ansible/prompt-dialog.js
+++ b/awx/ui/static/lib/ansible/prompt-dialog.js
@@ -24,7 +24,7 @@ angular.module('PromptDialog', ['Utilities'])
         scope.promptHeader = params.hdr;
         scope.promptBody = params.body;
         var cls = (params['class'] == null || params['class'] == undefined) ? 'btn-danger' : params['class'];
-        $('#prompt-action-btn').addClass(cls); //Use jquery because django template engine conflicts with Angular's
+        $('#prompt_action_btn').addClass(cls); //Use jquery because django template engine conflicts with Angular's
                                                // use of {{...}}
         //scope.id = params.id; 
         //scope.url = params.url; 
diff --git a/awx/ui/templates/ui/index.html b/awx/ui/templates/ui/index.html
index 8e554f8d35..5a121c9456 100644
--- a/awx/ui/templates/ui/index.html
+++ b/awx/ui/templates/ui/index.html
@@ -125,10 +125,11 @@
          <div class="nav-collapse navbar-responsive-collapse">
            <ul class="nav navbar-nav pull-right">
              <li ng-show="current_user.username != null && current_user.username != undefined">
-                 <a href="" ng-click="viewCurrentUser()" ng-bind="'Hello! ' + current_user.username"></a></li>
-             <li ng-show="userLoggedIn == true"><a href="" ng-click="viewLicense()">View License</a></li>
-             <li ng-show="userLoggedIn == true"><a href="mailto:support@ansibleworks.com?subject=AWX%20Help%20Request">Contact Support</a><li>
-             <li ng-show="userLoggedIn == true"><a href="#/logout">Logout</a></li>
+                 <a id="main_view_user" href="" ng-click="viewCurrentUser()" ng-bind="'Hello! ' + current_user.username"></a></li>
+             <li ng-show="userLoggedIn == true"><a id="main_view_license" href="" ng-click="viewLicense()">View License</a></li>
+             <li ng-show="userLoggedIn == true"><a id="main_contact_support" 
+                  href="mailto:support@ansibleworks.com?subject=AWX%20Help%20Request">Contact Support</a><li>
+             <li ng-show="userLoggedIn == true"><a id="main_logout" href="#/logout">Logout</a></li>
            </ul>
          </div><!-- nav-collapse -->
        </div>
@@ -138,15 +139,15 @@
 
     <div class="row">
       <div class="col-lg-12">
-        <ul class="nav nav-tabs">
-          <li class="active"><a href="#organizations" data-toggle="tab">Organizations</a></li>
-          <li><a href="#users" data-toggle="tab">Users</a></li>
-          <li><a href="#teams" data-toggle="tab">Teams</a></li>
-          <li><a href="#projects" data-toggle="tab">Projects</a></li>
-          <li><a href="#inventories" data-toggle="tab">Inventories</a></li>
-          <li><a href="#credentials" data-toggle="tab">Credentials</a></li>
-          <li><a href="#job_templates" data-toggle="tab">Job Templates</a></li>
-          <li><a href="#jobs" data-toggle="tab">Jobs</a></li>
+        <ul class="nav nav-tabs" id="main_tabs">
+          <li class="active"><a href="#organizations" id="main_organizations_tab" data-toggle="tab">Organizations</a></li>
+          <li><a href="#users" id="main_users_tab" data-toggle="tab">Users</a></li>
+          <li><a href="#teams" id="main_teams_tab" data-toggle="tab">Teams</a></li>
+          <li><a href="#projects" id="main_projects_tab" data-toggle="tab">Projects</a></li>
+          <li><a href="#inventories" id="main_inventories_tab" data-toggle="tab">Inventories</a></li>
+          <li><a href="#credentials" id="main_credentials_tab" data-toggle="tab">Credentials</a></li>
+          <li><a href="#job_templates" id="main_job_templates_tab" data-toggle="tab">Job Templates</a></li>
+          <li><a href="#jobs" id="main_jobs_tab" data-toggle="tab">Jobs</a></li>
         </ul>
      
         <div class="tab-content">
@@ -207,8 +208,8 @@
               </div>
               <div class="modal-body" id="password-body"></div>
               <div class="modal-footer">
-                <a href="" ng-click="cancelJob()" class="btn btn-default">Cancel</a>
-                <a href="" ng-click="startJob()" class="btn btn-primary" ng-disabled="password_form.$pristine || password_form.$invalid">Continue</a>
+                <a href="" ng-click="cancelJob()" class="btn btn-default" id="password_cancel_btn">Cancel</a>
+                <a href="" ng-click="startJob()" class="btn btn-primary" id="password_continue_btn" ng-disabled="password_form.$pristine || password_form.$invalid">Continue</a>
               </div>
           </div><!-- modal-content -->
        </div><!-- modal-dialog -->
@@ -227,8 +228,8 @@
               <div class="modal-footer">
                 <button ng-show="formModalInfo !== undefined && formModalInfo != ''" ng-click="formModalInfoAction()" 
                     class="btn btn-sm pull-left"><i class="icon-zoom-in"></i> <span ng-bind="formModalInfo"></span></button>
-                <a href="#" ng-show="formModalCancelShow" data-target="#form-modal" data-dismiss="modal" class="btn btn-default">Cancel</a>
-                <a href="" ng-bind="formModalActionLabel" ng-click="formModalAction()" ng-disabled="formModalActionDisabled" class="btn btn-primary"></a>
+                <a href="#" ng-show="formModalCancelShow" data-target="#form-modal" data-dismiss="modal" id="form_cancel_btn" class="btn btn-default">Cancel</a>
+                <a href="" ng-bind="formModalActionLabel" ng-click="formModalAction()" ng-disabled="formModalActionDisabled" id="form_ok_btn" class="btn btn-primary"></a>
               </div>
           </div><!-- modal-content -->
        </div><!-- modal-dialog -->
@@ -246,8 +247,9 @@
               <div class="modal-footer">
                 <a href="" ng-bind="formModal2Info" ng-show="formModal2Info !== undefined && formModal2Info != ''" ng-click="formModal2InfoAction()" 
                     class="btn btn-default btn-sm pull-left"><i class="icon-zoom-in"></i> <span ng-bind="formModal2Info"></span></a>
-                <a href="#" ng-show="formModal2CancelShow" data-target="#form-modal2" data-dismiss="modal" class="btn btn-default">Cancel</a>
-                <a href="" ng-bind="formModal2ActionLabel" ng-click="formModal2Action()" class="btn btn-primary"></a>
+                <a href="#" ng-show="formModal2CancelShow" data-target="#form-modal2" data-dismiss="modal" id="form2_cancel_btn"
+                    class="btn btn-default">Cancel</a>
+                <a href="" ng-bind="formModal2ActionLabel" ng-click="formModal2Action()" id="form2_ok_btn" class="btn btn-primary"></a>
               </div>
           </div><!-- modal-content -->
        </div><!-- modal-dialog -->
@@ -264,8 +266,8 @@
               </div>
               <div class="modal-body" id="lookup-modal-body"></div>
               <div class="modal-footer">
-                <a href="#" data-target="#lookup-modal" data-dismiss="modal" class="btn btn-default">Cancel</a>
-                <a href="" ng-click="selectAction()" class="btn btn-primary">Select</a>
+                <a href="#" data-target="#lookup-modal" data-dismiss="modal" id="lookup_cancel_btn" class="btn btn-default">Cancel</a>
+                <a href="" ng-click="selectAction()" id="lookup_select_btn" class="btn btn-primary">Select</a>
               </div>
           </div><!-- modal-content -->
        </div><!-- modal-dialog -->
@@ -283,8 +285,8 @@
               <div class="modal-body" ng-bind-html-unsafe="promptBody" id="prompt-body">
               </div>
               <div class="modal-footer">
-                <a href="#" data-target="#prompt-modal" data-dismiss="modal" class="btn btn-default">No</a>
-                <a href="" ng-class="promptActionBtnClass" ng-click="promptAction()" id="prompt-action-btn" class="btn btn-primary">Yes</a>
+                <a href="#" data-target="#prompt-modal" data-dismiss="modal" id="prompt_cancel_btn" class="btn btn-default">No</a>
+                <a href="" ng-class="promptActionBtnClass" ng-click="promptAction()" id="prompt_action_btn" class="btn btn-primary">Yes</a>
               </div>
           </div><!-- modal-content -->
        </div><!-- modal-dialog -->
@@ -303,7 +305,7 @@
                 <div class="alert" ng-class="alertClass" ng-bind-html-unsafe="alertBody"></div>
               </div>
               <div class="modal-footer">
-                <a href="#" ng-hide="disableButtons" data-target="#form-modal" data-dismiss="modal" class="btn btn-primary">OK</a>
+                <a href="#" ng-hide="disableButtons" data-target="#form-modal" data-dismiss="modal" id="alert_ok_btn" class="btn btn-primary">OK</a>
               </div>
           </div><!-- modal-content -->
        </div><!-- modal-dialog -->
@@ -321,7 +323,7 @@
                 <div class="alert" ng-class="alertClass2" ng-bind-html-unsafe="alertBody2"></div>
               </div>
               <div class="modal-footer">
-                <a href="#" ng-hide="disableButtons2" data-target="#form-modal2" data-dismiss="modal" class="btn btn-primary">OK</a>
+                <a href="#" ng-hide="disableButtons2" data-target="#form-modal2" data-dismiss="modal" id="alert2_ok_btn" class="btn btn-primary">OK</a>
               </div>
           </div><!-- modal-content -->
        </div><!-- modal-dialog -->