diff --git a/app/views/admin/builds/index.html.haml b/app/views/admin/builds/index.html.haml
index 7d84172bd2efe235b10d0dff24abc7ab5593c08a..e44e58880fa7c636d364991b6e06670b56edca2d 100644
--- a/app/views/admin/builds/index.html.haml
+++ b/app/views/admin/builds/index.html.haml
@@ -4,8 +4,8 @@
 %div{ class: container_class }
 
   .top-area
-    - build_path = ->(scope) { admin_builds_path(scope: scope) }
-    = render "shared/builds/tabs", build_path: build_path, all_builds: @all_builds, scope: @scope
+    - build_path_proc = ->(scope) { admin_builds_path(scope: scope) }
+    = render "shared/builds/tabs", build_path_proc: build_path_proc, all_builds: @all_builds, scope: @scope
 
     .nav-controls
       - if @all_builds.running_or_pending.any?
diff --git a/app/views/projects/builds/_table.html.haml b/app/views/projects/builds/_table.html.haml
index da43dbb8d81cb5797595f28c377616f6f1d3edbb..d77405b2b1fa75ea0bd6b1f82c1fdc183872f591 100644
--- a/app/views/projects/builds/_table.html.haml
+++ b/app/views/projects/builds/_table.html.haml
@@ -1,4 +1,5 @@
-- admin = false unless admin
+- admin = false unless defined?(admin)
+
 - if builds.blank?
   %li
     .nothing-here-block No builds to show
@@ -15,13 +16,11 @@
           %th Stage
           %th Name
           %th
-          %th
-            - if !admin && project.build_coverage_enabled?
-              Coverage
+          %th Coverage
           %th
 
       - if admin
-        = render partial: "projects/ci/builds/build", collection: builds, as: :build, locals: { commit_sha: true, ref: true, stage: true, allow_retry: true, runner: true, admin: true }
+        = render partial: "projects/ci/builds/build", collection: builds, as: :build, locals: { commit_sha: true, ref: true, stage: true, allow_retry: true, runner: true, coverage: true, admin: true }
       - else
         = render partial: "projects/ci/builds/build", collection: builds, as: :build, locals: {commit_sha: true, ref: true, stage: true, allow_retry: true, coverage: project.build_coverage_enabled? }
 
diff --git a/app/views/projects/builds/index.html.haml b/app/views/projects/builds/index.html.haml
index d2fc2ae34fec628679556088769a38af90ce1a03..5c60b7a73643b78e60592488764e0c5f2ee3021e 100644
--- a/app/views/projects/builds/index.html.haml
+++ b/app/views/projects/builds/index.html.haml
@@ -4,8 +4,8 @@
 
 %div{ class: container_class }
   .top-area
-    - build_path = ->(scope) { project_builds_path(@project, scope: scope) }
-    = render "shared/builds/tabs", build_path: build_path, all_builds: @all_builds, scope: @scope
+    - build_path_proc = ->(scope) { project_builds_path(@project, scope: scope) }
+    = render "shared/builds/tabs", build_path_proc: build_path_proc, all_builds: @all_builds, scope: @scope
 
     .nav-controls
       - if can?(current_user, :update_build, @project)
diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml
index ecf15c77ad1f284b60567dba9c460d9753111118..37e507ea00afe733481b91f98b36043fe0ac9a4d 100644
--- a/app/views/projects/ci/builds/_build.html.haml
+++ b/app/views/projects/ci/builds/_build.html.haml
@@ -1,4 +1,4 @@
-- admin = false unless admin
+- admin = false unless defined?(admin)
 
 %tr.build.commit
   %td.status
diff --git a/app/views/shared/builds/_tabs.html.haml b/app/views/shared/builds/_tabs.html.haml
index 398ccf480d96ca2a95c0f59a8f79b6cfdd55b074..49ab28bd47bc5db2bf1b754b009ae4ac5de2c0e5 100644
--- a/app/views/shared/builds/_tabs.html.haml
+++ b/app/views/shared/builds/_tabs.html.haml
@@ -1,24 +1,24 @@
 %ul.nav-links
   %li{class: ('active' if scope.nil?)}
-    = link_to build_path.call(nil) do
+    = link_to build_path_proc.call(nil) do
       All
       %span.badge.js-totalbuilds-count
         = number_with_delimiter(all_builds.count(:id))
 
   %li{class: ('active' if scope == 'pending')}
-    = link_to build_path.call('pending') do
+    = link_to build_path_proc.call('pending') do
       Pending
       %span.badge
         = number_with_delimiter(all_builds.pending.count(:id))
 
   %li{class: ('active' if scope == 'running')}
-    = link_to build_path.call('running') do
+    = link_to build_path_proc.call('running') do
       Running
       %span.badge
         = number_with_delimiter(all_builds.running.count(:id))
 
   %li{class: ('active' if scope == 'finished')}
-    = link_to build_path.call('finished') do
+    = link_to build_path_proc.call('finished') do
       Finished
       %span.badge
         = number_with_delimiter(all_builds.finished.count(:id))