diff --git a/awx/ui/static/js/controllers/Jobs.js b/awx/ui/static/js/controllers/Jobs.js
index 1db357fb04..9ace263098 100644
--- a/awx/ui/static/js/controllers/Jobs.js
+++ b/awx/ui/static/js/controllers/Jobs.js
@@ -82,7 +82,7 @@ function JobsListCtrl ($scope, $rootScope, $location, $log, $routeParams, Rest,
 
     scope.refresh = function() {
        scope['jobSearchSpin'] = true;
-       scope['jobLoading'] = true;
+       scope['jobLoading'] = false;
        Refresh({ scope: scope, set: 'jobs', iterator: 'job', url: scope['current_url'] });
        }
 
diff --git a/awx/ui/static/js/controllers/Projects.js b/awx/ui/static/js/controllers/Projects.js
index 27bbac4ed4..aa7445ead2 100644
--- a/awx/ui/static/js/controllers/Projects.js
+++ b/awx/ui/static/js/controllers/Projects.js
@@ -202,7 +202,7 @@ function ProjectsList ($scope, $rootScope, $location, $log, $routeParams, Rest,
 
     scope.refresh = function() {
         scope['projectSearchSpin'] = true;
-        scope['projectLoading'] = true;
+        scope['projectLoading'] = false;
         Refresh({ scope: scope, set: 'projects', iterator: 'project', url: scope['current_url'] });
         }
 
diff --git a/awx/ui/static/js/forms/Jobs.js b/awx/ui/static/js/forms/Jobs.js
index bcae47986b..cecaa6a4e2 100644
--- a/awx/ui/static/js/forms/Jobs.js
+++ b/awx/ui/static/js/forms/Jobs.js
@@ -300,9 +300,13 @@ angular.module('JobFormDefinition', [])
 
         statusActions: {
              refresh: {
-                awRefresh: true,
-                ngShow: "(status == 'pending' || status == 'waiting' || status == 'running')",
-                mode: 'all'
+                dataPlacement: 'top',
+                icon: "icon-refresh",
+                mode: 'all',
+                ngShow: "job_status == 'pending' || job_status == 'waiting' || job_status == 'running'",
+                'class': 'btn-xs btn-primary',
+                awToolTip: "Refresh the page",
+                ngClick: "refresh()"
                 }
             }
             
diff --git a/awx/ui/static/js/lists/InventorySummary.js b/awx/ui/static/js/lists/InventorySummary.js
index f34f57d427..22663559ca 100644
--- a/awx/ui/static/js/lists/InventorySummary.js
+++ b/awx/ui/static/js/lists/InventorySummary.js
@@ -126,8 +126,12 @@ angular.module('InventorySummaryDefinition', [])
                 id: "inventory-summary-help"
                 },
             refresh: {
-                awRefresh: true,
-                mode: 'all'
+                dataPlacement: 'top',
+                icon: "icon-refresh",
+                mode: 'all',
+                'class': 'btn-xs btn-primary',
+                awToolTip: "Refresh the page",
+                ngClick: "refresh()"
                 }
             },
 
diff --git a/awx/ui/static/js/lists/JobEvents.js b/awx/ui/static/js/lists/JobEvents.js
index d9a4c2150d..9f8bdd8093 100644
--- a/awx/ui/static/js/lists/JobEvents.js
+++ b/awx/ui/static/js/lists/JobEvents.js
@@ -86,9 +86,13 @@ angular.module('JobEventsListDefinition', [])
         
         actions: {
             refresh: {
-                awRefresh: true,
+                dataPlacement: 'top',
+                icon: "icon-refresh",
+                mode: 'all',
                 ngShow: "job_status == 'pending' || job_status == 'waiting' || job_status == 'running'",
-                mode: 'all'
+                'class': 'btn-xs btn-primary',
+                awToolTip: "Refresh the page",
+                ngClick: "refresh()"
                 }
             },
 
diff --git a/awx/ui/static/js/lists/JobHosts.js b/awx/ui/static/js/lists/JobHosts.js
index 38ed204d73..8784c14c18 100644
--- a/awx/ui/static/js/lists/JobHosts.js
+++ b/awx/ui/static/js/lists/JobHosts.js
@@ -120,9 +120,13 @@ angular.module('JobHostDefinition', [])
                 iconSize: 'large'
                 },
             refresh: {
-                awRefresh: true,
+                dataPlacement: 'top',
+                icon: "icon-refresh",
+                mode: 'all',
                 ngShow: "host_id == null && (job_status == 'pending' || job_status == 'waiting' || job_status == 'running')",
-                mode: 'all'
+                'class': 'btn-xs btn-primary',
+                awToolTip: "Refresh the page",
+                ngClick: "refresh()"
                 }
             },
 
diff --git a/awx/ui/static/js/lists/Jobs.js b/awx/ui/static/js/lists/Jobs.js
index a8b64430e0..5ebd0e1a61 100644
--- a/awx/ui/static/js/lists/Jobs.js
+++ b/awx/ui/static/js/lists/Jobs.js
@@ -76,8 +76,12 @@ angular.module('JobsListDefinition', [])
         
         actions: {
             refresh: {
-                awRefresh: true,
-                mode: 'all'
+                dataPlacement: 'top',
+                icon: "icon-refresh",
+                mode: 'all',
+                'class': 'btn-xs btn-primary',
+                awToolTip: "Refresh the page",
+                ngClick: "refresh()"
                 }
             },
 
diff --git a/awx/ui/static/js/lists/Projects.js b/awx/ui/static/js/lists/Projects.js
index 87d1c7078f..7cd30f6bdd 100644
--- a/awx/ui/static/js/lists/Projects.js
+++ b/awx/ui/static/js/lists/Projects.js
@@ -72,8 +72,12 @@ angular.module('ProjectsListDefinition', [])
                 iconSize: 'large'
                 },
              refresh: {
-                awRefresh: true,
-                mode: 'all'
+                dataPlacement: 'top',
+                icon: "icon-refresh",
+                mode: 'all',
+                'class': 'btn-xs btn-primary',
+                awToolTip: "Refresh the page",
+                ngClick: "refresh()"
                 }
             },
 
diff --git a/awx/ui/static/lib/ansible/form-generator.js b/awx/ui/static/lib/ansible/form-generator.js
index 3c8e9038ba..a16ef84438 100644
--- a/awx/ui/static/lib/ansible/form-generator.js
+++ b/awx/ui/static/lib/ansible/form-generator.js
@@ -632,6 +632,7 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies'])
             html += buildId(field, fld, this.form);
             html += (options.mode == 'edit' && field.editRequired) ? "required " : "";
             html += (options.mode == 'add' && field.addRequired) ? "required " : "";
+            html += (field.multiSelect) ? "multiple " : "";
             html += (field.readonly) ? "readonly " : "";
             html += (field.awRequiredWhen) ? "data-awrequired-init=\"" + field.awRequiredWhen.init + "\" aw-required-when=\"" +
                   field.awRequiredWhen.variable + "\" " : "";