diff --git a/awx/ui/static/js/controllers/Projects.js b/awx/ui/static/js/controllers/Projects.js
index 55f58e2501..1563213718 100644
--- a/awx/ui/static/js/controllers/Projects.js
+++ b/awx/ui/static/js/controllers/Projects.js
@@ -35,10 +35,14 @@ function ProjectsList ($scope, $rootScope, $location, $log, $routeParams, Rest,
     scope.projectsPostRefresh = scope.$on('PostRefresh', function() {
         if (scope.projects) {
            for (var i=0; i < scope.projects.length; i++) {
+               if (scope.projects[i].status == 'ok') {
+                  scope.projects[i].status = 'n/a';
+               }
                switch(scope.projects[i].status) {
                    case 'updating':
                    case 'successful':
                    case 'ok':
+                   case 'n/a':
                       scope.projects[i].badge = 'false';
                       break;
                    case 'never updated':
diff --git a/awx/ui/static/js/lists/Credentials.js b/awx/ui/static/js/lists/Credentials.js
index 7cb6558bd0..ee78f72ba0 100644
--- a/awx/ui/static/js/lists/Credentials.js
+++ b/awx/ui/static/js/lists/Credentials.js
@@ -26,7 +26,8 @@ angular.module('CredentialsListDefinition', [])
                 label: 'Name'
                 },
             description: {
-                label: 'Description'
+                label: 'Description',
+                excludeModal: true
                 },
             team: {
                 label: 'Team',
diff --git a/awx/ui/static/js/lists/Projects.js b/awx/ui/static/js/lists/Projects.js
index d6629ebfac..ca634abdb0 100644
--- a/awx/ui/static/js/lists/Projects.js
+++ b/awx/ui/static/js/lists/Projects.js
@@ -29,14 +29,19 @@ angular.module('ProjectsListDefinition', [])
                 badgeTipPlacement: 'bottom'
                 },
             description: {
-                label: 'Description'
+                label: 'Description',
+                columnClass: 'hidden-sm hidden-xs',
+                excludeModal: true
                 },
             last_updated: {
                 label: 'Last Updated',
                 type: 'date'
                 },
             status: {
-                label: 'Status'
+                label: 'Update Status',
+                ngClick: 'showSCMStatus(\{\{ project.id \}\})',
+                awToolTip: 'View details of last SCM Update',
+                dataPlacement: 'bottom'
                 }
             },
         
@@ -63,7 +68,7 @@ angular.module('ProjectsListDefinition', [])
                     "<dt>Failed</dt><dd>An error occurred during the most recent SCM update.</dd>\n" +
                     "<dt>Successful</dt><dd>The latest SCM update ran to completion without incident.</dd>\n" +
                     "<dt>Missing</dt><dd>The local project directory is missing.</dd>\n" +
-                    "<dt>OK</dt><dd>The project does not use SCM, and the directory is present.</dd>\n" +
+                    "<dt>N/A</dt><dd>The project does not use SCM, so an update status is not available.</dd>\n" +
                     "</dl>\n",
                 dataPlacement: 'left',
                 dataContainer: 'body',
@@ -85,13 +90,6 @@ angular.module('ProjectsListDefinition', [])
                 "class": 'btn-xs btn-default',
                 awToolTip: 'View/edit project'
                 },
-            scm_status: {
-                label: 'Status',
-                icon: 'icon-th-list',
-                ngClick: 'showSCMStatus(\{\{ project.id \}\})',
-                "class": 'btn-xs btn-default',
-                awToolTip: 'View SCM status'
-                },
             scm_update: {
                 label: 'Update',
                 icon: 'icon-cloud-download',
diff --git a/awx/ui/static/less/ansible-ui.less b/awx/ui/static/less/ansible-ui.less
index 73c890ea72..3053a4d2b2 100644
--- a/awx/ui/static/less/ansible-ui.less
+++ b/awx/ui/static/less/ansible-ui.less
@@ -28,7 +28,6 @@ body {
 .pad-left-lg { padding-left: 50px; }
 .normal-weight { font-weight: normal; }
 
-
 /* Working... spinner */
 .spinny {
   display: none;
@@ -910,6 +909,7 @@ tr td button i {
 
 }
 
+
 /* Large desktop */
 
 @media (min-width: 1200px) {
diff --git a/awx/ui/static/lib/ansible/generator-helpers.js b/awx/ui/static/lib/ansible/generator-helpers.js
index 67fedb0b9e..b62f96938b 100644
--- a/awx/ui/static/lib/ansible/generator-helpers.js
+++ b/awx/ui/static/lib/ansible/generator-helpers.js
@@ -207,14 +207,21 @@ angular.module('GeneratorHelpers', ['GeneratorHelpers'])
            // Start the Link
            if ((field.key || field.link || field.linkTo || field.ngClick ) && options['mode'] != 'lookup' && options['mode'] != 'select') {
               if (field.linkTo) {
-                 html += "<a href=\"#" + field.linkTo + "\">";
+                 html += "<a href=\"#" + field.linkTo + "\" ";
               }
               else if (field.ngClick) {
-                 html += "<a href=\"\"" + Attr(field, 'ngClick') + ">";
+                 html += "<a href=\"\"" + Attr(field, 'ngClick') + " ";
               }
               else if (field.link == undefined || field.link) {
-                 html += "<a href=\"#/" + base + "/{{" + list.iterator + ".id }}\">";
+                 html += "<a href=\"#/" + base + "/{{" + list.iterator + ".id }}\" ";
               }
+              if (field.awToolTip) {
+                 html += Attr(field, 'awToolTip');
+                 if (field.dataPlacement) {
+                    html += Attr(field,'dataPlacement');
+                 }
+              }
+              html += ">";
            }
 
            // Add icon: