diff --git a/app/models/sample.rb b/app/models/sample.rb
index 2f3a1c2c..4d01e740 100644
--- a/app/models/sample.rb
+++ b/app/models/sample.rb
@@ -1,12 +1,13 @@
 class Sample
   attr_reader :school, :academic_year, :category, :measure, :race
 
-  def initialize
-    @school = School.find_by_slug 'milford-high-school'
-    @academic_year = AcademicYear.last
-    @category = Category.find_by_category_id '1'
-    @subcategory = Subcategory.find_by_subcategory_id '1A'
-    @measure = Measure.find_by_measure_id '1A-ii'
-    @race = Race.find_by_qualtrics_code 1
+  def initialize(slug: 'milford-high-school', range: '2021-22', category_id: '1', subcategory_id: '1A',
+                 measure_id: '1A-ii', race_code: 1)
+    @school = School.find_by_slug slug
+    @academic_year = AcademicYear.find_by_range range
+    @category = Category.find_by_category_id category_id
+    @subcategory = Subcategory.find_by_subcategory_id subcategory_id
+    @measure = Measure.find_by_measure_id measure_id
+    @race = Race.find_by_qualtrics_code race_code
   end
 end
diff --git a/app/views/analyze/_data_filters.html.erb b/app/views/analyze/_data_filters.html.erb
index bd4f1a6d..b7d5f95e 100644
--- a/app/views/analyze/_data_filters.html.erb
+++ b/app/views/analyze/_data_filters.html.erb
@@ -3,10 +3,13 @@
 <div class="bg-gray p-3" data-controller="analyze">
   <% @graphs.each do |graph| %>
   <div>
-    <input type="radio" id="<%= graph.value %>" name="graph"
-    value="<%= base_url %>"
-    data-action="click->analyze#refresh"
-    <%= graph.value == @graph.value ? "checked" : "" %>>
+    <input type="radio"
+           id="<%= graph.value %>"
+           class="form-check-input"
+           name="graph"
+            value="<%= base_url %>"
+            data-action="click->analyze#refresh"
+            <%= graph.value == @graph.value ? "checked" : "" %>>
     <label for="<%= graph.value %>"><%= graph.to_s %></label>
   </div>
   <% end %>
@@ -14,10 +17,10 @@
   <p class="sub-header-5 mt-3 font-size-14"> Select a group </p>
 
     <% @races.each do |race | %>
-      <div class="d-flex <%= race.slug %>">
+      <div class="d-flex align-items-center <%= race.slug %>">
         <input
           id="<%= race.slug %>"
-          class="m-3 race-checkbox"
+          class="m-3 race-checkbox form-check-input"
           type="checkbox"
           name="race-checkbox"
           value="<%= base_url %>"
diff --git a/app/views/analyze/_school_years.html.erb b/app/views/analyze/_school_years.html.erb
index d8f9145f..c2d67acd 100644
--- a/app/views/analyze/_school_years.html.erb
+++ b/app/views/analyze/_school_years.html.erb
@@ -2,6 +2,7 @@
 <% available_academic_years.each_with_index do | year, index | %>
   <div class="d-flex justify-content-start align-items-center mt-1" data-controller="analyze">
     <input type="checkbox"
+    class="form-check-input"
     id="<%= year.range %>"
     name="year-checkbox"
     value="<%= analyze_subcategory_link(district: district, school: school, academic_year: academic_year, category: category, subcategory: subcategory) %>"