diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
index d954aa30..8bb10469 100644
--- a/app/controllers/dashboard_controller.rb
+++ b/app/controllers/dashboard_controller.rb
@@ -9,7 +9,9 @@ class DashboardController < ApplicationController
   private
 
   def measure_ids
-    %w(1A-i 2A-i 4C-i)
+    Measure.all.map {|measure |
+      measure.measure_id
+    }
   end
 
   def presenter_for_measure(measure)
diff --git a/app/presenters/measure_graph_row_presenter.rb b/app/presenters/measure_graph_row_presenter.rb
index 82a225c4..dd9487f5 100644
--- a/app/presenters/measure_graph_row_presenter.rb
+++ b/app/presenters/measure_graph_row_presenter.rb
@@ -8,6 +8,10 @@ class MeasureGraphRowPresenter
     @measure.name
   end
 
+  def measure_id
+    @measure.measure_id
+  end
+
   def bar_color
     "fill-#{zone.type}"
   end
diff --git a/app/views/dashboard/_measure_bar_graph.erb b/app/views/dashboard/_measure_bar_graph.erb
index e2dd0631..d54a65a8 100644
--- a/app/views/dashboard/_measure_bar_graph.erb
+++ b/app/views/dashboard/_measure_bar_graph.erb
@@ -54,7 +54,7 @@
 
       <svg id="measure-row-bars" x="25%" y=<%= heading_gutter %> width="75%">
         <%= measure_graph_row_presenters.each_with_index do |presenter, index| %>
-          <rect class="measure-row-bar <%= presenter.bar_color %>" x="<%= presenter.x_offset %>" y="<%= index * measure_row_height + (measure_row_height - measure_row_bar_height) / 2 %>" width="<%= presenter.bar_width %>" height=<%= measure_row_bar_height %> />
+          <rect class="measure-row-bar <%= presenter.bar_color %>" x="<%= presenter.x_offset %>" y="<%= index * measure_row_height + (measure_row_height - measure_row_bar_height) / 2 %>" width="<%= presenter.bar_width %>" height=<%= measure_row_bar_height %> data-for-measure-id="<%= presenter.measure_id  %>"/>
         <% end %>
       </svg>
     </g>
diff --git a/spec/features/school_dashboard_feature_spec.rb b/spec/features/school_dashboard_feature_spec.rb
index 5024f56c..50458fe1 100644
--- a/spec/features/school_dashboard_feature_spec.rb
+++ b/spec/features/school_dashboard_feature_spec.rb
@@ -1,6 +1,6 @@
-require "rails_helper"
+require 'rails_helper'
 
-feature "School dashboard", type: feature do
+feature 'School dashboard', type: feature do
   let(:district) { District.find_by_slug 'winchester' }
   let(:school) { School.find_by_slug 'winchester-high-school' }
 
@@ -20,16 +20,21 @@ feature "School dashboard", type: feature do
   let(:ay_2020_21) { AcademicYear.find_by_range '2020-21' }
 
   before :each do
-    SurveyItemResponse.create response_id: rand.to_s, academic_year: ay_2020_21, school: school, survey_item: survey_item_1_for_measure_1A_i, likert_score: 4
-    SurveyItemResponse.create response_id: rand.to_s, academic_year: ay_2020_21, school: school, survey_item: survey_item_2_for_measure_1A_i, likert_score: 5
-
-    SurveyItemResponse.create response_id: rand.to_s, academic_year: ay_2020_21, school: school, survey_item: survey_item_1_for_measure_2A_i, likert_score: 5
-    SurveyItemResponse.create response_id: rand.to_s, academic_year: ay_2020_21, school: school, survey_item: survey_item_2_for_measure_2A_i, likert_score: 5
-
-    SurveyItemResponse.create response_id: rand.to_s, academic_year: ay_2020_21, school: school, survey_item: survey_item_1_for_measure_4C_i, likert_score: 1
+    SurveyItemResponse.create response_id: rand.to_s, academic_year: ay_2020_21, school: school,
+                              survey_item: survey_item_1_for_measure_1A_i, likert_score: 4
+    SurveyItemResponse.create response_id: rand.to_s, academic_year: ay_2020_21, school: school,
+                              survey_item: survey_item_2_for_measure_1A_i, likert_score: 5
+
+    SurveyItemResponse.create response_id: rand.to_s, academic_year: ay_2020_21, school: school,
+                              survey_item: survey_item_1_for_measure_2A_i, likert_score: 5
+    SurveyItemResponse.create response_id: rand.to_s, academic_year: ay_2020_21, school: school,
+                              survey_item: survey_item_2_for_measure_2A_i, likert_score: 5
+
+    SurveyItemResponse.create response_id: rand.to_s, academic_year: ay_2020_21, school: school,
+                              survey_item: survey_item_1_for_measure_4C_i, likert_score: 1
   end
 
-  scenario "User authentication fails" do
+  scenario 'User authentication fails' do
     page.driver.browser.basic_authorize('wrong username', 'wrong password')
 
     visit "/districts/winchester/schools/#{school.slug}/dashboard?year=2020-21"
@@ -37,7 +42,7 @@ feature "School dashboard", type: feature do
     expect(page).not_to have_text(school.name)
   end
 
-  scenario "User views a school dashboard" do
+  scenario 'User views a school dashboard' do
     page.driver.browser.basic_authorize(username, password)
 
     visit "/districts/#{district.slug}/schools/#{school.slug}/dashboard?year=#{ay_2020_21.range}"
@@ -49,16 +54,21 @@ feature "School dashboard", type: feature do
     expect(page).to have_text(school.name)
 
     expect(page).to have_text('Professional Qualifications')
-    expect(measure_row_bars[0]['width']).to eq '20.66%'
-    expect(measure_row_bars[0]['x']).to eq '50%'
+    professional_qualifications_row = measure_row_bars.find { |item| item['data-for-measure-id'] == '1A-i' }
+    expect(professional_qualifications_row['width']).to eq '20.66%'
+    expect(professional_qualifications_row['x']).to eq '50%'
 
     expect(page).to have_text('Student Physical Safety')
-    expect(measure_row_bars[1]['width']).to eq '50.0%'
-    expect(measure_row_bars[1]['x']).to eq '50%'
+    student_physical_safety_row = measure_row_bars.find { |item| item['data-for-measure-id'] == '2A-i' }
+    expect(student_physical_safety_row['width']).to eq '50.0%'
+    expect(student_physical_safety_row['x']).to eq '50%'
 
     expect(page).to have_text('Problem Solving Emphasis')
-    expect(measure_row_bars[2]['width']).to eq '50.0%'
-    expect(measure_row_bars[2]['x']).to eq '0.0%'
+    problem_solving_emphasis_row = measure_row_bars.find { |item| item['data-for-measure-id'] == '4C-i' }
+    expect(problem_solving_emphasis_row['width']).to eq '50.0%'
+    expect(problem_solving_emphasis_row['x']).to eq '0.0%'
+
+    page.assert_selector('.measure-row-bar', count: Measure.count)
   end
 
   let(:username) { 'winchester' }