diff --git a/app/views/builds.html b/app/views/builds.html
index 08fb44672f..7cb3794dcd 100644
--- a/app/views/builds.html
+++ b/app/views/builds.html
@@ -41,29 +41,28 @@ <h1>
                   </tr>
                 </thead>
                 <tbody ng-if="!(latestByConfig | hashSize)">
-                  <tr><td colspan="6"><em>{{emptyMessage}}</em></td></tr>
+                  <tr><td colspan="7"><em>{{emptyMessage}}</em></td></tr>
                 </tbody>
                 <tbody ng-if="(latestByConfig | hashSize)">
-                  <!-- Build config with no builds-->
-                  <tr ng-repeat="(buildConfigName, latestBuild) in latestByConfig" ng-if="!latestBuild">
-                    <td data-title="Name">
+                  <tr ng-repeat="(buildConfigName, latestBuild) in latestByConfig">
+                    <!-- Build config with no builds-->
+                    <td ng-if-start="!latestBuild" data-title="Name">
                       <a href="{{buildConfigs[buildConfigName] | navigateResourceURL}}">{{buildConfigName}}</a>
                     </td>
                     <td data-title="Last Build"><em>No builds</em></td>
                     <td class="hidden-xs">&nbsp;</td>
                     <td class="hidden-xs">&nbsp;</td>
+                    <td class="hidden-xs">&nbsp;</td>
                     <td data-title="Type">{{buildConfigs[buildConfigName].spec.strategy.type | startCase}}</td>
-                    <td data-title="Source">
+                    <td ng-if-end data-title="Source">
                       <span ng-if="buildConfigs[buildConfigName].spec.source.type == 'None'"><i>none</i></span>
                       <span class="word-break" ng-if="buildConfigs[buildConfigName].spec.source.type == 'Git'" ><osc-git-link
                                             uri="buildConfigs[buildConfigName].spec.source.git.uri"
                                             ref="buildConfigs[buildConfigName].spec.source.git.ref"
                                             context-dir="buildConfigs[buildConfigName].spec.source.contextDir">{{buildConfigs[buildConfigName].spec.source.git.uri}}</osc-git-link></span></td>
-                  </tr>
-                  <!-- Build config with builds, or builds whose build config has since been deleted -->
-                  <!-- We only show the first build from a build config for now-->
-                  <tr ng-if="latestBuild && (buildConfigs[buildConfigName] || !unfilteredBuildConfigs[buildConfigName])">
-                    <td data-title="Name">
+                    <!-- Build config with builds, or builds whose build config has since been deleted -->
+                    <!-- We only show the first build from a build config for now-->
+                    <td ng-if-start="latestBuild && (buildConfigs[buildConfigName] || !unfilteredBuildConfigs[buildConfigName])" data-title="Name">
                       <a ng-if="buildConfigName" href="{{latestBuild | configURLForResource}}">{{buildConfigName}}</a>
                       <span ng-if="buildConfigs && buildConfigName && !buildConfigs[buildConfigName]" class="pficon pficon-warning-triangle-o" data-toggle="tooltip" title="This build config no longer exists" style="cursor: help;"></span>
                       <span ng-if="buildConfigName == ''"><em>none</em></span>
@@ -96,7 +95,7 @@ <h1>
                       <span am-time-ago="latestBuild.metadata.creationTimestamp"></span>
                     </td>
                     <td data-title="Type">{{latestBuild.spec.strategy.type | startCase}}</td>
-                    <td data-title="Source" class="word-break-all">
+                    <td ng-if-end data-title="Source" class="word-break-all">
                       <span ng-if="latestBuild.spec.source">
                         <span ng-if="latestBuild.spec.source.type == 'None'">
                           <i>none</i>
diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js
index 0fef0917bf..882292a1b6 100644
--- a/dist/scripts/templates.js
+++ b/dist/scripts/templates.js
@@ -4038,26 +4038,25 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</tr>\n" +
     "</thead>\n" +
     "<tbody ng-if=\"!(latestByConfig | hashSize)\">\n" +
-    "<tr><td colspan=\"6\"><em>{{emptyMessage}}</em></td></tr>\n" +
+    "<tr><td colspan=\"7\"><em>{{emptyMessage}}</em></td></tr>\n" +
     "</tbody>\n" +
     "<tbody ng-if=\"(latestByConfig | hashSize)\">\n" +
+    "<tr ng-repeat=\"(buildConfigName, latestBuild) in latestByConfig\">\n" +
     "\n" +
-    "<tr ng-repeat=\"(buildConfigName, latestBuild) in latestByConfig\" ng-if=\"!latestBuild\">\n" +
-    "<td data-title=\"Name\">\n" +
+    "<td ng-if-start=\"!latestBuild\" data-title=\"Name\">\n" +
     "<a href=\"{{buildConfigs[buildConfigName] | navigateResourceURL}}\">{{buildConfigName}}</a>\n" +
     "</td>\n" +
     "<td data-title=\"Last Build\"><em>No builds</em></td>\n" +
     "<td class=\"hidden-xs\">&nbsp;</td>\n" +
     "<td class=\"hidden-xs\">&nbsp;</td>\n" +
+    "<td class=\"hidden-xs\">&nbsp;</td>\n" +
     "<td data-title=\"Type\">{{buildConfigs[buildConfigName].spec.strategy.type | startCase}}</td>\n" +
-    "<td data-title=\"Source\">\n" +
+    "<td ng-if-end data-title=\"Source\">\n" +
     "<span ng-if=\"buildConfigs[buildConfigName].spec.source.type == 'None'\"><i>none</i></span>\n" +
     "<span class=\"word-break\" ng-if=\"buildConfigs[buildConfigName].spec.source.type == 'Git'\"><osc-git-link uri=\"buildConfigs[buildConfigName].spec.source.git.uri\" ref=\"buildConfigs[buildConfigName].spec.source.git.ref\" context-dir=\"buildConfigs[buildConfigName].spec.source.contextDir\">{{buildConfigs[buildConfigName].spec.source.git.uri}}</osc-git-link></span></td>\n" +
-    "</tr>\n" +
     "\n" +
     "\n" +
-    "<tr ng-if=\"latestBuild && (buildConfigs[buildConfigName] || !unfilteredBuildConfigs[buildConfigName])\">\n" +
-    "<td data-title=\"Name\">\n" +
+    "<td ng-if-start=\"latestBuild && (buildConfigs[buildConfigName] || !unfilteredBuildConfigs[buildConfigName])\" data-title=\"Name\">\n" +
     "<a ng-if=\"buildConfigName\" href=\"{{latestBuild | configURLForResource}}\">{{buildConfigName}}</a>\n" +
     "<span ng-if=\"buildConfigs && buildConfigName && !buildConfigs[buildConfigName]\" class=\"pficon pficon-warning-triangle-o\" data-toggle=\"tooltip\" title=\"This build config no longer exists\" style=\"cursor: help\"></span>\n" +
     "<span ng-if=\"buildConfigName == ''\"><em>none</em></span>\n" +
@@ -4090,7 +4089,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<span am-time-ago=\"latestBuild.metadata.creationTimestamp\"></span>\n" +
     "</td>\n" +
     "<td data-title=\"Type\">{{latestBuild.spec.strategy.type | startCase}}</td>\n" +
-    "<td data-title=\"Source\" class=\"word-break-all\">\n" +
+    "<td ng-if-end data-title=\"Source\" class=\"word-break-all\">\n" +
     "<span ng-if=\"latestBuild.spec.source\">\n" +
     "<span ng-if=\"latestBuild.spec.source.type == 'None'\">\n" +
     "<i>none</i>\n" +