diff --git a/awx/ui/static/less/ansible-ui.less b/awx/ui/static/less/ansible-ui.less
index db6c07f4e4..6af34ce1fd 100644
--- a/awx/ui/static/less/ansible-ui.less
+++ b/awx/ui/static/less/ansible-ui.less
@@ -86,6 +86,11 @@ hr {
   white-space: nowrap;
 }
 
+th.actions-column,
+td.actions {
+  white-space: nowrap;
+}
+
 .tab-content {
   padding-top: 20px;
 }
@@ -944,4 +949,13 @@ tr td button i {
     table-layout: fixed;
   }
 
+  th.actions-column,
+  td.actions {
+    white-space: normal;
+  }
+
+  td.actions button {
+     width: 75px;
+     margin-bottom: 5px;
+  } 
 }
diff --git a/awx/ui/static/lib/ansible/list-generator.js b/awx/ui/static/lib/ansible/list-generator.js
index 09bc51590c..ae94641d5b 100644
--- a/awx/ui/static/lib/ansible/list-generator.js
+++ b/awx/ui/static/lib/ansible/list-generator.js
@@ -202,7 +202,7 @@ angular.module('ListGenerator', ['GeneratorHelpers'])
        html += "</div><!-- row -->\n";
          
        // table header row
-       html += "<table class=\"table table-condensed"
+       html += "<table class=\"table"
        html += (list['class']) ? " " + list['class'] : "";
        html += (options.mode == 'lookup' || options.id) ? ' table-hover-inverse' : '';
        html += (list.hover) ? ' table-hover' : '';
@@ -247,7 +247,7 @@ angular.module('ListGenerator', ['GeneratorHelpers'])
           html += "<th>Select</th>";
        }
        else if (options.mode == 'edit') {
-          html += "<th></th>\n";
+          html += "<th class=\"actions-column\"></th>\n";
        }
        html += "</tr>\n";
        html += "</thead>\n";
@@ -315,7 +315,7 @@ angular.module('ListGenerator', ['GeneratorHelpers'])
        // End List
        html += "</tbody>\n";
        html += "</table>\n";
-
+       
        if (options.mode == 'select' && (options.selectButton == undefined || options.selectButton == true)) {
           html += "<div class=\"navigation-buttons\">\n";
           html += " <button class=\"btn btn-small btn-primary pull-right\" aw-tool-tip=\"Complete your selection\" " +