diff --git a/app/assets/stylesheets/application.sass.scss b/app/assets/stylesheets/application.sass.scss
index 9d0fd363..28db437b 100644
--- a/app/assets/stylesheets/application.sass.scss
+++ b/app/assets/stylesheets/application.sass.scss
@@ -21,3 +21,7 @@ dialog::backdrop {
 #add-criteria-button.usa-button {
   background-color: #4d8055;
 }
+
+.usa-combo-box .border-secondary + input {
+  border: 1px solid red;
+}
\ No newline at end of file
diff --git a/app/controllers/evaluation_forms_controller.rb b/app/controllers/evaluation_forms_controller.rb
index dcfa29b4..5980adce 100644
--- a/app/controllers/evaluation_forms_controller.rb
+++ b/app/controllers/evaluation_forms_controller.rb
@@ -2,6 +2,8 @@
 
 # Controller for evaluation forms CRUD actions.
 class EvaluationFormsController < ApplicationController
+  helper FormHelper
+
   before_action -> { authorize_user('challenge_manager') }
   before_action :set_evaluation_form, only: %i[show edit update destroy]
   before_action :set_evaluation_forms, only: %i[index]
@@ -99,7 +101,7 @@ def set_available_phases
   def evaluation_form_params
     permitted = params.require(:evaluation_form).
       permit(:title, :instructions, :phase_id, :status, :comments_required,
-             :weighted_scoring, :publication_date, :closing_date, :challenge_id,
+             :scale_type, :publication_date, :closing_date, :challenge_id,
              evaluation_criteria_attributes: [
                :id, :title, :description, :points_or_weight, :scoring_type,
                :option_range_start, :option_range_end, :_destroy,
diff --git a/app/helpers/evaluation_forms_helper.rb b/app/helpers/evaluation_forms_helper.rb
index a73f8a6f..ce39b6aa 100644
--- a/app/helpers/evaluation_forms_helper.rb
+++ b/app/helpers/evaluation_forms_helper.rb
@@ -29,11 +29,6 @@ def evaluation_period(evaluation_form)
     "#{start_date} - #{end_date}"
   end
 
-  def inline_error(evaluation_form, field)
-    error = evaluation_form.errors[field].present? ? evaluation_form.errors[field].first : ""
-    tag.span(error, class: "text-secondary font-body-2xs", id: "evaluation_form_#{field}_error")
-  end
-
   def criteria_field_id(form, attribute, is_template)
     prefix = "evaluation_form_evaluation_criteria_attributes"
 
diff --git a/app/helpers/form_helper.rb b/app/helpers/form_helper.rb
new file mode 100644
index 00000000..6154023a
--- /dev/null
+++ b/app/helpers/form_helper.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+# Helpers for rendering various form elements and errors
+module FormHelper
+  def label_error_class(form, field)
+    object = form.object
+    object.errors[field].present? ? "text-secondary" : ""
+  end
+
+  def input_error_class(form, field)
+    object = form.object
+    object.errors[field].present? ? "border-secondary" : ""
+  end
+
+  def inline_error(form, field)
+    object = form.object
+    field_id = (form.object_name + "_#{field}_error").gsub(/[\[\]]/, "_").squeeze('_')
+    error = object.errors[field].present? ? object.errors[field].join(", ") : ""
+
+    tag.span(error, class: "text-secondary font-body-2xs", id: field_id)
+  end
+end
diff --git a/app/javascript/controllers/evaluation_criteria_controller.js b/app/javascript/controllers/evaluation_criteria_controller.js
index 97873799..2412069a 100644
--- a/app/javascript/controllers/evaluation_criteria_controller.js
+++ b/app/javascript/controllers/evaluation_criteria_controller.js
@@ -16,6 +16,9 @@ export default class extends Controller {
     this.replacePlaceholders(newCriteria);
     this.enableInputs(newCriteria);
 
+    this.collapseAllCriteria();
+    this.expandCriterion(newCriteria);
+
     this.criteriaListTarget.appendChild(newCriteria);
 
     this.updateCriteriaTitles();
@@ -40,6 +43,26 @@ export default class extends Controller {
     this.updateCriteriaTitles();
   }
 
+  collapseAllCriteria() {
+    const accordionButtons = this.element.querySelectorAll(
+      ".usa-accordion__button"
+    );
+    const accordions = this.element.querySelectorAll(".usa-accordion__content");
+
+    accordionButtons.forEach((button) =>
+      button.setAttribute("aria-expanded", false)
+    );
+    accordions.forEach((content) => content.setAttribute("hidden", ""));
+  }
+
+  expandCriterion(criterion) {
+    const accordionButton = criterion.querySelector(".usa-accordion__button");
+    const accordionContent = criterion.querySelector(".usa-accordion__content");
+
+    if (accordionButton) accordionButton.setAttribute("aria-expanded", true);
+    if (accordionContent) accordionContent.removeAttribute("hidden");
+  }
+
   toggleScoringType(event) {
     const row = event.target.closest(".criteria-row");
     const scoringType = row.querySelector(".scoring-type-radio:checked").value;
@@ -171,7 +194,7 @@ export default class extends Controller {
       .querySelectorAll(".criteria-option-label-row")
       .forEach((labelRow, index) => {
         labelRow.style.display =
-          index >= start && index <= end ? "flex" : "none";
+          index >= start && index <= end ? "block" : "none";
         const input = labelRow.querySelector("input");
         input.disabled = index < start || index > end;
       });
diff --git a/app/javascript/controllers/evaluation_form_controller.js b/app/javascript/controllers/evaluation_form_controller.js
index 104c6dfd..0113cfef 100644
--- a/app/javascript/controllers/evaluation_form_controller.js
+++ b/app/javascript/controllers/evaluation_form_controller.js
@@ -21,11 +21,10 @@ export default class extends Controller {
         "data-min-date",
         `${year}-${month}-${day}`
       );
-
-      this.updateErrorMessage("evaluation_form_challenge_id", "");
-      this.updateErrorMessage("evaluation_form_phase_id", "");
     } else {
-      this.updateErrorMessage("evaluation_form_challenge_id", "can't be blank");
+      this.challengeIDTarget.value = null;
+      this.phaseIDTarget.value = null;
+
       this.startDateTarget.innerHTML = "mm/dd/yyyy";
     }
   }
@@ -72,15 +71,43 @@ export default class extends Controller {
   }
 
   validatePresence(e) {
-    if (!e.target.value) {
-      e.target.classList.add("border-secondary");
-      this.updateErrorMessage(e.target.id, "can't be blank");
+    const target = e.target;
+    const formGroup = target.closest(".usa-form-group");
+    const fieldName = target.dataset.fieldName || target.id;
+
+    const label = this.findLabel(target, formGroup);
+
+    if (!target.value) {
+      this.addErrorClasses(target, label);
+      this.updateErrorMessage(fieldName, "can't be blank");
     } else {
-      e.target.classList.remove("border-secondary");
-      this.updateErrorMessage(e.target.id, "");
+      this.removeErrorClasses(target, label);
+      this.updateErrorMessage(fieldName, "");
     }
   }
 
+  findLabel(target, formGroup) {
+    const isSelect =
+      target.tagName === "SELECT" ||
+      target.classList.contains("usa-combo-box__input");
+    const isRadio = target.type === "radio";
+
+    const labelId = isSelect ? target.name : target.id;
+    const labelQuery = isRadio ? "legend" : `label[for="${labelId}"]`;
+
+    return formGroup.querySelector(labelQuery);
+  }
+
+  addErrorClasses(target, label) {
+    target.classList.add("border-secondary");
+    if (label) label.classList.add("text-secondary");
+  }
+
+  removeErrorClasses(target, label) {
+    target.classList.remove("border-secondary");
+    if (label) label.classList.remove("text-secondary");
+  }
+
   updateErrorMessage(field, message) {
     document.getElementById(field + "_error").innerHTML = message;
   }
diff --git a/app/models/evaluation_criterion.rb b/app/models/evaluation_criterion.rb
index c0f83b49..a0b39db9 100644
--- a/app/models/evaluation_criterion.rb
+++ b/app/models/evaluation_criterion.rb
@@ -37,4 +37,19 @@ class EvaluationCriterion < ApplicationRecord
   validates :title, length: { maximum: 150 }
   validates :description, length: { maximum: 1000 }
   validates :points_or_weight, numericality: { only_integer: true }
+  validates :scoring_type, presence: true
+
+  validate :validate_option_labels_not_blank, if: -> { rating? || binary? }
+
+  private
+
+  def validate_option_labels_not_blank
+    return unless option_labels.is_a?(Hash)
+
+    option_labels.each do |key, value|
+      if value.blank?
+        errors.add("option_labels_#{key}", "can't be blank")
+      end
+    end
+  end
 end
diff --git a/app/models/evaluation_form.rb b/app/models/evaluation_form.rb
index 8645bea4..1b3edb06 100644
--- a/app/models/evaluation_form.rb
+++ b/app/models/evaluation_form.rb
@@ -8,7 +8,7 @@
 #  title             :string           not null
 #  instructions      :string           not null
 #  comments_required :boolean          default(FALSE)
-#  weighted_scoring  :boolean          default(FALSE)
+#  scale_type        :string           not null
 #  closing_date      :date             not null
 #  challenge_id      :bigint           not null
 #  created_at        :datetime         not null
@@ -17,12 +17,14 @@
 #
 class EvaluationForm < ApplicationRecord
   belongs_to :challenge
-  belongs_to :phase
+  belongs_to :phase, optional: true # Disables default must exist error message
   has_many :evaluation_criteria, lambda {
     order(:created_at)
   }, class_name: 'EvaluationCriterion', dependent: :destroy, inverse_of: :evaluation_form
   accepts_nested_attributes_for :evaluation_criteria, allow_destroy: true
 
+  enum :scale_type, { point: "point", weight: "weight" }, type: "string"
+
   scope :by_user, lambda { |user|
     joins(challenge: :challenge_manager_users).
       where(challenge_manager_users: { id: user.id })
@@ -30,28 +32,61 @@ class EvaluationForm < ApplicationRecord
 
   validates :title, presence: true, length: { maximum: 150 }
   validates :instructions, presence: true
+  validates :scale_type, presence: true
   validates :closing_date, presence: true
 
+  # Adds custom error message for phase presence failure instead of default from above
+  validates :phase, presence: { message: I18n.t("evaluation_form.phase.presence_error") }
   validates :phase_id, uniqueness: true
 
   validate :criteria_weights_must_sum_to_one_hundred
   validate :validate_unique_criteria_titles
 
+  def weighted_scoring?
+    scale_type == "weight"
+  end
+
+  def point_scoring?
+    scale_type == "point"
+  end
+
   private
 
   def validate_unique_criteria_titles
-    titles = evaluation_criteria.reject(&:marked_for_destruction?).map(&:title)
+    duplicate_titles = find_duplicate_titles
+
+    add_criteria_title_errors(duplicate_titles) unless duplicate_titles.empty?
+  end
+
+  def find_duplicate_titles
+    current_criteria_titles = evaluation_criteria.reject(&:marked_for_destruction?).map(&:title)
+    current_criteria_titles.select { |title| current_criteria_titles.count(title) > 1 }.uniq
+  end
 
-    return unless titles.uniq.length != titles.length
+  def add_criteria_title_errors(duplicate_titles)
+    criteria = evaluation_criteria.
+      reject(&:marked_for_destruction?).
+      select { |c| duplicate_titles.include?(c.title) }.
+      reject { |c| c.errors.added?(:title, I18n.t("evaluation_criteria.duplicate_title_error")) }
 
+    criteria.each { |c| c.errors.add(:title, I18n.t("evaluation_criteria.duplicate_title_error")) }
     errors.add(:base, I18n.t("evaluation_criterion_unique_title_in_form_error"))
   end
 
   def criteria_weights_must_sum_to_one_hundred
-    total_weight = evaluation_criteria.reject(&:marked_for_destruction?).sum(&:points_or_weight)
+    return unless weighted_scoring? && total_criteria_weight != 100
 
-    return unless weighted_scoring? && total_weight != 100
+    add_weight_errors
+  end
+
+  def total_criteria_weight
+    evaluation_criteria.reject(&:marked_for_destruction?).sum { |criteria| criteria.points_or_weight.to_i }
+  end
 
+  def add_weight_errors
+    evaluation_criteria.reject(&:marked_for_destruction?).each do |criteria|
+      criteria.errors.add("points_or_weight", I18n.t("evaluation_criteria.must_sum_to_100_error"))
+    end
     errors.add(:base, I18n.t("evaluation_form_criteria_weight_total_error"))
   end
 end
diff --git a/app/views/evaluation_forms/_evaluation_criterion_fields.html.erb b/app/views/evaluation_forms/_evaluation_criterion_fields.html.erb
index 5a375040..406c6a8e 100644
--- a/app/views/evaluation_forms/_evaluation_criterion_fields.html.erb
+++ b/app/views/evaluation_forms/_evaluation_criterion_fields.html.erb
@@ -2,7 +2,7 @@
   <button
     type="button"
     class="usa-accordion__button display-flex flex-justify icon-white"
-    aria-expanded="<%= f.object.persisted? ? false : true %>"
+    aria-expanded="<%= !f.object.persisted? || f.object.errors.any? %>"
     aria-controls="<%= criteria_field_id(f, "accordion", is_template) %>"
     data-evaluation-criteria-target="accordionButton"
     data-action="click->evaluation-criteria#validateInputs"
@@ -18,100 +18,113 @@
   <% end %>
 
   <div class="usa-form-group margin-top-0">
-    <%= f.label :title, "Criteria title", for: criteria_field_id(f, "title", is_template), class: "text-bold" %>
-    <span style="color: darkred;">*</span>
-    <%= image_tag "images/usa-icons/help_outline.svg", width: 16, height: 16, alt: "Help for criteria title" %>
+    <div class="display-flex flex-align-center text-bold">
+      <%= f.label :title, "Criteria title", for: criteria_field_id(f, "title", is_template), class: "margin-right-05 #{label_error_class(f, :title)}" %>
+      <span class="margin-right-05" style="color: darkred;">*</span>
+      <%= image_tag "images/usa-icons/help_outline.svg", width: 16, height: 16, alt: "Help for criteria title" %>
+    </div>
 
     <%= f.text_field :title, 
       id: criteria_field_id(f, "title", is_template),
       name: criteria_field_name(f, "title", is_template),
-      class: "usa-input", 
-      placeholder: "Add criteria title here", 
+      class: "usa-input #{input_error_class(f, :title)}",
       maxlength: 150,
-      required: true, 
       disabled: is_template || form_disabled,
-      data: {"evaluation-criteria-target": "titleField"}
+      data: {
+        "evaluation-criteria-target": "titleField",
+        "action": "evaluation-form#validatePresence focusout->evaluation-form#validatePresence"
+        }
     %>
+
+    <%= inline_error(f, :title) %>
   </div>
 
-  <div class="usa-character-count">
-    <div class="usa-form-group">
-      <%= f.label :description, "Criteria description", for: criteria_field_id(f, "description", is_template), class: "text-bold" %>
-      <span style="color: darkred;">*</span>
-      <%= image_tag "images/usa-icons/help_outline.svg", width: 16, height: 16, alt: "Help for criteria title" %>
+  <div class="usa-form-group">
+    <div class="usa-character-count">
+      <div class="display-flex flex-align-center text-bold">
+        <%= f.label :description, "Criteria description", for: criteria_field_id(f, "description", is_template), class: "margin-right-05 #{label_error_class(f, :description)}" %>
+        <span class="margin-right-05" style="color: darkred;">*</span>
+        <%= image_tag "images/usa-icons/help_outline.svg", width: 16, height: 16, alt: "Help for criteria title" %>
+      </div>
 
       <%= f.text_area :description, 
         id: criteria_field_id(f, "description", is_template),
         name: criteria_field_name(f, "description", is_template),
-        class: "usa-textarea usa-character-count__field", 
-        placeholder: "Add criteria description here", 
+        class: "usa-textarea usa-character-count__field #{input_error_class(f, :description)}",
         maxlength: 1000,
-        required: true, 
         disabled: is_template || form_disabled,
-        data: {"evaluation-criteria-target": "descriptionField"}
+        data: {
+          "evaluation-criteria-target": "descriptionField",
+          "action": "evaluation-form#validatePresence focusout->evaluation-form#validatePresence"
+        }
       %>
+      <span class="usa-character-count__message">You can enter up to 1000 characters</span>
     </div>
-    <span class="usa-character-count__message">You can enter up to 1000 characters</span>
+
+    <%= inline_error(f, :description) %>
   </div>
 
-  <div class="usa-form-group display-flex flex-align-center">
+  <div class="usa-form-group">
+    <div class="display-flex flex-align-center text-bold">
+      <%= f.label :points_or_weight, "Criteria Points/Weight", for: criteria_field_id(f, "points_or_weight", is_template), class: "margin-right-05 #{label_error_class(f, :points_or_weight)}" %>
+      <span class="margin-right-05" style="color: darkred;">*</span>
+      <%= image_tag "images/usa-icons/help_outline.svg", width: 16, height: 16, alt: "Help for criteria title" %>
+    </div>
+
     <%= f.number_field :points_or_weight, 
       id: criteria_field_id(f, "points_or_weight", is_template),
       name: criteria_field_name(f, "points_or_weight", is_template),
-      class: "points-or-weight usa-input flex-1 margin-top-0 margin-right-2 font-sans-lg",
+      class: "points-or-weight usa-input #{input_error_class(f, :points_or_weight)}",
       min: 1, 
       max: f.object.evaluation_form&.weighted_scoring? ? 100 : 9999,
       step: 1, 
-      placeholder: "Add criteria points/weight here",
-      required: true, 
       disabled: is_template || form_disabled,
       data: { 
         "evaluation-criteria-target": "pointsOrWeightField",
-        action: "input->evaluation-criteria#checkPointsOrWeightMax blur->evaluation-criteria#checkPointsOrWeightMax"
+        action: "
+          input->evaluation-criteria#checkPointsOrWeightMax blur->evaluation-criteria#checkPointsOrWeightMax
+          evaluation-form#validatePresence focusout->evaluation-form#validatePresence
+        "
       }
     %>
 
-    <div class="flex-7 font-sans-lg">
-      <%= f.label :points_or_weight, "Criteria Points/Weight", 
-        for: criteria_field_id(f, "points_or_weight", is_template),
-        class: "text-bold"
-      %>
-
-      <span style="color: darkred;">*</span>
-      
-      <%= image_tag "images/usa-icons/help_outline.svg", 
-        width: 16, height: 16, alt: "Help for criteria title", 
-        class: "flex-0" 
-      %>
-    </div>
+    <%= inline_error(f, :points_or_weight) %>
   </div>
 
   <div class="usa-form-group">
-    <%= f.label :scoring_type, "Scoring Type", for: criteria_field_id(f, "scoring_type", is_template), class: "font-sans-lg text-bold" %>
-    <span style="color: darkred;">*</span>
-    <%= image_tag "images/usa-icons/help_outline.svg", width: 16, height: 16, alt: "Help for criteria title" %>
-
-    <% scoring_types = { "numeric" => "Numeric score / points", "rating" => "Rating scale", "binary" => "Binary scale" } %>
-    <div>
-      <% scoring_types.each_with_index do |(value, label), index| %>
-        <div class="usa-radio">
-          <%= f.radio_button :scoring_type, value, 
-              id: criteria_field_id(f, "scoring_type_#{value}", is_template), 
-              name: criteria_field_name(f, :scoring_type, is_template),
-              class: "usa-radio__input scoring-type-radio",
-              checked: f.object.scoring_type == value,
-              required: index == 0,
-              disabled: is_template || form_disabled,
-              data: {
-                "evaluation-criteria-target": "scoringTypeRadio",
-                action: "click->evaluation-criteria#toggleScoringType"
-              }
-          %>
+    <fieldset class="usa-fieldset margin-top-205">
+      <legend class="usa-legend display-flex flex-align-center text-bold <%= label_error_class(f, :scoring_type) %>">
+        <span class="margin-right-05">Scoring type</span>
+        <span class="margin-right-05" style="color: darkred;">*</span>
+        <%= image_tag "images/usa-icons/help_outline.svg", width: 16, height: 16, alt: "Help for criteria title" %>
+      </legend>
+
+      <% scoring_types = { "numeric" => "Numeric score / points", "rating" => "Rating scale", "binary" => "Binary scale" } %>
+      <div>
+        <% scoring_types.each_with_index do |(value, label), index| %>
+          <div class="usa-radio">
+            <%= f.radio_button :scoring_type, value,
+                id: criteria_field_id(f, "scoring_type_#{value}", is_template),
+                name: criteria_field_name(f, :scoring_type, is_template),
+                class: "usa-radio__input scoring-type-radio",
+                checked: f.object.scoring_type == value,
+                disabled: is_template || form_disabled,
+                data: {
+                  "evaluation-criteria-target": "scoringTypeRadio",
+                  action: "click->evaluation-criteria#toggleScoringType evaluation-form#validatePresence",
+                  field_name: criteria_field_id(f, "scoring_type", is_template)
+                }
+            %>
+
+            <%= label_tag criteria_field_id(f, "scoring_type_#{value}", is_template), label, class: "usa-radio__label" %>
+          </div>
+        <% end %>
+      </div>
 
-          <%= label_tag criteria_field_id(f, "scoring_type_#{value}", is_template), label, class: "usa-radio__label" %>
-        </div>
-      <% end %>
-    </div>
+      <div class="margin-top-1">
+        <%= inline_error(f, :scoring_type) %>
+      </div>
+    </fieldset>
   </div>
 
   <div class="criteria-scale-options usa-form-group" style="<%= f.object.numeric? || !f.object.scoring_type.present? || is_template ? 'display: none;' : '' %>">
@@ -163,20 +176,26 @@
       <% (0..10).each do |index| %>
         <% disabledOptionLabel = is_template || !f.object.scoring_type.present? || f.object.numeric? || ((f.object.option_range_start && index < f.object.option_range_start) || (f.object.option_range_end && index > f.object.option_range_end)) %>
 
-        <div class="<%= disabledOptionLabel ? 'display-none' : 'display-flex' %> flex-align-center flex-justify margin-top-2 criteria-option-label-row"
-          data-evaluation-criteria-target="optionLabelRow">
-          <%= label_tag criteria_field_id(f, "option_labels", is_template) ++ "_#{index}", index, class: "font-sans-lg text-bold text-base margin-right-2" %>
-
-          <%= f.text_field "option_labels", 
-            id: criteria_field_id(f, "option_labels", is_template) ++ "_#{index}",
-            name: criteria_field_name(f, "option_labels", is_template) ++ "[#{index}]",
-            class: "usa-input margin-0",
-            value: f.object.option_labels[index.to_s],
-            required: true, 
-            disabled: disabledOptionLabel || form_disabled,
-            data: {"evaluation-criteria-target": "optionLabelInput"}
-          %>
+        <div class="<%= disabledOptionLabel ? 'display-none' : 'display' %> margin-top-2 criteria-option-label-row" data-evaluation-criteria-target="optionLabelRow">
+          <div class="display-flex flex-align-center flex-justify">
+            <%= label_tag criteria_field_id(f, "option_labels", is_template) ++ "_#{index}", index, class: "font-sans-lg text-bold text-base margin-right-2 #{label_error_class(f, "option_labels_#{index}")}" %>
+
+            <%= f.text_field "option_labels",
+              id: criteria_field_id(f, "option_labels", is_template) ++ "_#{index}",
+              name: criteria_field_name(f, "option_labels", is_template) ++ "[#{index}]",
+              class: "usa-input margin-0 #{input_error_class(f, "option_labels_#{index}")}",
+              value: f.object.option_labels[index.to_s],
+              disabled: disabledOptionLabel || form_disabled,
+              data: {
+                "action": "evaluation-form#validatePresence focusout->evaluation-form#validatePresence",
+                "evaluation-criteria-target": "optionLabelInput"
+              }
+            %>
+          </div>
+
+          <%= inline_error(f, "option_labels_#{index}") %>
         </div>
+
       <% end %>
     </div>
   </div>
diff --git a/app/views/evaluation_forms/_evaluation_form.json.jbuilder b/app/views/evaluation_forms/_evaluation_form.json.jbuilder
index 6c22c78e..fc1b3fdf 100644
--- a/app/views/evaluation_forms/_evaluation_form.json.jbuilder
+++ b/app/views/evaluation_forms/_evaluation_form.json.jbuilder
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 json.extract!(evaluation_form, :id, :title, :instructions, :phase_id, :status, :comments_required,
-              :weighted_scoring, :publication_date, :closing_date, :challenge_id, :created_at, :updated_at)
+              :scale_type, :publication_date, :closing_date, :challenge_id, :created_at, :updated_at)
 json.url(evaluation_form_url(evaluation_form, format: :json))
diff --git a/app/views/evaluation_forms/_form.html.erb b/app/views/evaluation_forms/_form.html.erb
index 1a273b59..41440bc7 100644
--- a/app/views/evaluation_forms/_form.html.erb
+++ b/app/views/evaluation_forms/_form.html.erb
@@ -1,13 +1,16 @@
 <%= form_with(model: evaluation_form, data: { controller: "evaluation-form modal" }) do |form| %>
   <% if evaluation_form.errors.any? %>
     <div style="color: darkred">
-      <h2><%= pluralize(evaluation_form.errors.count, "error") %> prohibited this evaluation form from being saved:</h2>
-
-      <ul>
-        <% evaluation_form.errors.each do |error| %>
-          <li><%= error.full_message %></li>
-        <% end %>
-      </ul>
+      <div class="usa-alert usa-alert--error" role="alert">
+        <div class="usa-alert__body">
+          <h2 class="usa-alert__heading"><%= pluralize(evaluation_form.errors.count, "error") %> prohibited this evaluation form from being saved:</h2>
+          <ul>
+            <% evaluation_form.errors.each do |error| %>
+              <li><%= error.full_message %></li>
+            <% end %>
+          </ul>
+        </div>
+      </div>
     </div>
   <% end %>
   <%
@@ -25,85 +28,99 @@
         Create an evaluation form title, assign it to your challenge and
         provide instructions that will be shared with your evaluators. 
       </p>
-      <div>
-        <%= form.label :title, class: "usa-label text-bold font-sans-sm" do %>
-          Title <span style="color: darkred;">*</span>
-        <% end %>
+      <div class="usa-form-group">
+        <div class="display-flex flex-align-center text-bold">
+          <%= form.label :title, "Title", class: "margin-right-05 #{label_error_class(form, :title)}" %>
+          <span class="margin-right-05" style="color: darkred;">*</span>
+        </div>
+
         <%= form.text_field :title,
           maxlength: 150,
-          class: "usa-input",
+          class: "usa-input #{input_error_class(form, :title)}",
           data: {"action": "evaluation-form#validatePresence focusout->evaluation-form#validatePresence"},
-          required: true,
           disabled: disabled %>
-      </div>
 
-      <%= inline_error(evaluation_form, :title) %>
-
-      <label class="usa-label text-bold font-sans-sm" for="challenge-combo">
-        Select a Challenge <span style="color: darkred;">*</span>
-      </label>
-      <div class="usa-hint">Choose the challenge this form will evaluate.</div>
-      <div class="usa-combo-box" data-default-value="<%= combo_box_default_value %>">
-        <%= select_tag(
-          'challenge-combo',
-          options_for_select(options_for_available_phases(@available_phases)),
-          class: 'usa-select',
-          title: 'challenge-combo',
-          data: { action: 'evaluation-form#handleChallengeSelect' },
-          required: true,
-          disabled: disabled
-        ) %>
+        <%= inline_error(form, :title) %>
       </div>
-      
-      <%= inline_error(evaluation_form, :challenge_id) %>
-      <%= inline_error(evaluation_form, :phase_id) %>
 
-      <%= form.hidden_field :phase_id, {data: { "evaluation-form-target": 'phaseID'}} %>
-      <%= form.hidden_field :challenge_id, {data: { "evaluation-form-target": 'challengeID'}} %>
+      <div class="usa-form-group">
+        <div class="display-flex flex-align-center text-bold">
+          <%= form.label :phase, "Select a Challenge", class: "margin-right-05 #{label_error_class(form, :phase)}", for: "challenge-combo" %>
+          <span class="margin-right-05" style="color: darkred;">*</span>
+        </div>
+        <div class="usa-hint">Choose the challenge this form will evaluate.</div>
 
-      <div class="usa-character-count">
-        <div class="usa-form-group">
-          <%= form.label :instructions, class: "usa-label text-bold font-sans-sm" do %>
-            Instructions <span style="color: darkred;">*</span>
-          <% end %>
-          <%= form.text_area :instructions, class: "usa-textarea usa-character-count__field", maxlength: 3000, rows: "7", data: {"action": "evaluation-form#validatePresence focusout->evaluation-form#validatePresence"}, required: true, disabled: disabled%>
+        <div class="usa-combo-box" data-default-value="<%= combo_box_default_value %>">
+          <%= select_tag(
+            'challenge-combo',
+            options_for_select(options_for_available_phases(@available_phases)),
+            class: "usa-select #{input_error_class(form, :phase)}",
+            title: 'challenge-combo',
+            data: {
+              action: "evaluation-form#handleChallengeSelect evaluation-form#validatePresence focusout->evaluation-form#validatePresence",
+              field_name: "evaluation_form_phase"
+            },
+            disabled: disabled
+          ) %>
         </div>
-        <span id="with-hint-textarea-info" class="usa-character-count__message">You can enter up to 3000 characters</span>
+
+        <%= inline_error(form, :phase) %>
+
+        <%= form.hidden_field :phase_id, {data: { "evaluation-form-target": 'phaseID'}} %>
+        <%= form.hidden_field :challenge_id, {data: { "evaluation-form-target": 'challengeID'}} %>
       </div>
-      <%= inline_error(evaluation_form, :instructions) %>
 
+      <div class="usa-form-group">
+        <div class="usa-character-count">
+          <div class="display-flex flex-align-center text-bold">
+            <%= form.label :instructions, "Instructions", class: "margin-right-05 #{label_error_class(form, :instructions)}" %>
+            <span class="margin-right-05" style="color: darkred;">*</span>
+          </div>
+
+          <%= form.text_area :instructions, class: "usa-textarea usa-character-count__field #{input_error_class(form, :instructions)}", maxlength: 3000, rows: "7", data: {"action": "evaluation-form#validatePresence focusout->evaluation-form#validatePresence"}, disabled: disabled%>
+          <span id="with-hint-textarea-info" class="usa-character-count__message">You can enter up to 3000 characters</span>
+        </div>
+
+        <%= inline_error(form, :instructions) %>
+      </div>
     </li>
+
     <li class="usa-process-list__item">
       <h3 class="usa-process-list__heading">Evaluation Criteria</h3>
+
       <p>
         Build your evaluation criteria and scoring options.
       </p>
-      <div class="usa-checkbox">
-        <%= form.check_box :comments_required, class: "usa-checkbox__input", id: "evaluation_form_comments_required", disabled: disabled %>
-        <label class="usa-checkbox__label" for="evaluation_form_comments_required">
-          Require evaluators to provide comments on their scores. (optional)
-          <%= image_tag 'images/usa-icons/help_outline.svg', width: 16, height: 16, alt: 'Help for comments required' %>
-        </label>
+
+      <div class="display-flex flex-align-center text-bold">
+        <div class="usa-checkbox">
+          <%= form.check_box :comments_required, class: "usa-checkbox__input", id: "evaluation_form_comments_required", disabled: disabled %>
+          <%= form.label :comments_required, "Require evaluators to provide comments on their scores. (optional)", class: "usa-checkbox__label" %>
+        </div>
+
+        <%= image_tag 'images/usa-icons/help_outline.svg', width: 16, height: 16, alt: 'Help for comments required', style: "margin-top: .75rem" %>
       </div>
 
-      <div>
+      <div class="usa-form-group">
         <fieldset class="usa-fieldset margin-top-205">
-          <legend class="usa-legend usa-process-list__heading font-sans-md text-bold">
-            Scale Type <span style="color: darkred;">*</span>
+          <legend class="usa-legend usa-process-list__heading display-flex flex-align-center font-sans-md text-bold <%= label_error_class(form, :scale_type) %>">
+            <span class="margin-right-05">Scale Type</span>
+            <span class="margin-right-05" style="color: darkred;">*</span>
             <%= image_tag 'images/usa-icons/help_outline.svg', width: 16, height: 16, alt: 'Help for scale type' %>
           </legend>
+
           <div class="display-flex flex-row">
             <div class="usa-radio margin-right-205">
               <input
                 class="usa-radio__input"
                 id="point_scale"
                 type="radio"
-                name="evaluation_form[weighted_scoring]"
-                value="false"
-                data-action="click->evaluation-form#updateMaxPoints"
-                <%= 'checked' if evaluation_form.weighted_scoring == false && evaluation_form.persisted? %>
+                name="evaluation_form[scale_type]"
+                value="point"
+                data-action="click->evaluation-form#updateMaxPoints evaluation-form#validatePresence"
+                data-field-name="evaluation_form_scale_type"
+                <%= 'checked' if evaluation_form.point_scoring? %>
                 <%= 'disabled' if disabled %>
-                required
               >
               <label class="usa-radio__label font-sans-xs" for="point_scale">Point Scale</label>
             </div>
@@ -112,15 +129,20 @@
                 class="usa-radio__input"
                 id="weighted_scale"
                 type="radio"
-                name="evaluation_form[weighted_scoring]"
-                value="true"
-                data-action="click->evaluation-form#updateMaxPoints"
-                <%= 'checked' if evaluation_form.weighted_scoring == true %>
+                name="evaluation_form[scale_type]"
+                value="weight"
+                data-action="click->evaluation-form#updateMaxPoints evaluation-form#validatePresence"
+                data-field-name="evaluation_form_scale_type"
+                <%= 'checked' if evaluation_form.weighted_scoring? %>
                 <%= 'disabled' if disabled %>
               >
               <label class="usa-radio__label font-sans-xs" for="weighted_scale">Weighted Scale (%)</label>
             </div>
           </div>
+
+          <div class="margin-top-1">
+            <%= inline_error(form, :scale_type) %>
+          </div>
         </fieldset>
       </div>
 
@@ -161,32 +183,37 @@
         <% end %>
       </div>
     </li>
+
     <li class="usa-process-list__item">
       <h3 class="usa-process-list__heading">Evaluation Period</h3>
       <p>
         Set the end date of your evaluation period.
         Your evaluation start date is the end date of your challenge.
       </p>
+
       <div class="usa-label text-bold font-sans-sm">Evaluation Start Date:</div>
       <div class="usa-hint" data-evaluation-form-target="startDate">mm/dd/yyyy</div>
+
       <div class="usa-form-group">
-        <label class="usa-label text-bold font-sans-sm" id="evaluation_form_closing_date_label" for="evaluation_form_closing_date">
-          Evaluation End Date: <span style="color: darkred;">*</span>
-        </label>
+        <div class="display-flex flex-align-center text-bold">
+          <%= form.label :closing_date, "Evaluation End Date:", class: "margin-right-05 #{label_error_class(form, :closing_date)}" %>
+          <span style="color: darkred;">*</span>
+        </div>
         <div class="usa-hint" id="evaluation_form_closing_date_hint">mm/dd/yyyy</div>
+
         <div data-evaluation-form-target="datePicker" class="usa-date-picker" data-default-value="<%= evaluation_form.closing_date %>" data-min-date="<%= if evaluation_form.challenge then evaluation_form.challenge.end_date end %>">
           <input
-            class="usa-input"
+            class="usa-input <%= input_error_class(form, :closing_date) %>"
             id="evaluation_form_closing_date"
             name="evaluation_form[closing_date]"
-            aria-labelledby="evaluation_form_closing_date_label"
+            aria-labelledby="evaluation_form_closing_date"
             aria-describedby="evaluation_form_closing_date_hint"
             data-action="evaluation-form#validatePresence focusout->evaluation-form#validatePresence"
-            required
           />
         </div>
+
+        <%= inline_error(form, :closing_date) %>
       </div>
-      <%= inline_error(evaluation_form, :closing_date) %>
     </li>
   </ol>
 
diff --git a/config/initializers/field_with_errors.rb b/config/initializers/field_with_errors.rb
new file mode 100644
index 00000000..e240d7bb
--- /dev/null
+++ b/config/initializers/field_with_errors.rb
@@ -0,0 +1,8 @@
+ActionView::Base.field_error_proc = proc do |html_tag, instance|
+  if html_tag =~ /type="radio"/
+    html_tag.html_safe # Do not wrap radio buttons
+  else
+    # Wrap other inputs with the default div
+    %(<div class="field_with_errors">#{html_tag}</div>).html_safe
+  end
+end
\ No newline at end of file
diff --git a/config/locales/en.yml b/config/locales/en.yml
index c98189a1..1339adc4 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -36,6 +36,12 @@ en:
   login_error: "There was an issue with logging in. Please try again."
   please_try_again: "Please try again."
   session_expired_alert: "Your session has expired. Please log in again."
+  evaluation_form: 
+    phase:
+      presence_error: "can't be blank"
+  evaluation_criteria:
+    duplicate_title_error: "must be unique within criteria"
+    must_sum_to_100_error: "must sum to 100 with other criteria"
   evaluation_criterion_unique_title_in_form: "must be unique within the same form."
   evaluators:
     index:
diff --git a/db/migrate/20241217164258_change_weighted_scoring_in_evaluation_forms.rb b/db/migrate/20241217164258_change_weighted_scoring_in_evaluation_forms.rb
new file mode 100644
index 00000000..6c8ba5eb
--- /dev/null
+++ b/db/migrate/20241217164258_change_weighted_scoring_in_evaluation_forms.rb
@@ -0,0 +1,23 @@
+class ChangeWeightedScoringInEvaluationForms < ActiveRecord::Migration[7.2]
+  def up
+    add_column :evaluation_forms, :scale_type, :string
+
+    EvaluationForm.reset_column_information
+    EvaluationForm.find_each do |form|
+      form.update_columns(scale_type: form.weighted_scoring ? "weight" : "point")
+    end
+
+    remove_column :evaluation_forms, :weighted_scoring
+  end
+
+  def down
+    add_column :evaluation_forms, :weighted_scoring, :boolean
+
+    EvaluationForm.reset_column_information
+    EvaluationForm.find_each do |form|
+      form.update_columns(weighted_scoring: form.scale_type == "weight")
+    end
+
+    remove_column :evaluation_forms, :scale_type
+  end
+end
diff --git a/db/structure.sql b/db/structure.sql
index a636fffc..3fbc90c6 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -402,12 +402,12 @@ CREATE TABLE public.evaluation_forms (
     title character varying NOT NULL,
     instructions character varying NOT NULL,
     comments_required boolean DEFAULT false,
-    weighted_scoring boolean DEFAULT false,
     closing_date date NOT NULL,
     challenge_id bigint NOT NULL,
     created_at timestamp(6) without time zone NOT NULL,
     updated_at timestamp(6) without time zone NOT NULL,
-    phase_id bigint NOT NULL
+    phase_id bigint NOT NULL,
+    scale_type character varying
 );
 
 
@@ -1109,7 +1109,7 @@ CREATE TABLE public.submissions (
     description_delta text,
     brief_description_delta text,
     pdf_reference character varying(255),
-    comments character varying
+    comments text
 );
 
 
@@ -2465,6 +2465,7 @@ ALTER TABLE ONLY public.winners
 SET search_path TO "$user", public;
 
 INSERT INTO "schema_migrations" (version) VALUES
+(20241217164258),
 (20241125060011),
 (20241120024946),
 (20241120024939),
diff --git a/spec/factories/evaluation_form.rb b/spec/factories/evaluation_form.rb
index fdd1cdc8..a9382a50 100644
--- a/spec/factories/evaluation_form.rb
+++ b/spec/factories/evaluation_form.rb
@@ -8,7 +8,7 @@
     title { "#{Faker::Lorem.word.humanize} Evaluation Form" }
     instructions { Faker::Lorem.sentence(word_count: 10) }
     comments_required { Faker::Boolean.boolean }
-    weighted_scoring { Faker::Boolean.boolean }
+    scale_type { [:point, :weight].sample }
 
     # Factory options
     trait :with_comments do
@@ -16,7 +16,11 @@
     end
 
     trait :weighted do
-      weighted_scoring { true }
+      scale_type { "weight" }
+    end
+
+    trait :pointed do
+      scale_type { "point" }
     end
 
     # Creates 1-10 evaluation_criterion
@@ -43,7 +47,7 @@
     after(:create) do |evaluation_form|
       num_criteria = rand(1..10)
 
-      if evaluation_form.weighted_scoring
+      if evaluation_form.weighted_scoring?
         weights = Array.new(num_criteria) { rand(1..100) }
         total_weight = weights.sum.to_f
         normalized_weights = weights.map { |w| (w / total_weight * 100).round }
diff --git a/spec/helpers/evaluators_helper_spec.rb b/spec/helpers/evaluators_helper_spec.rb
index 4464c736..8ae797f2 100644
--- a/spec/helpers/evaluators_helper_spec.rb
+++ b/spec/helpers/evaluators_helper_spec.rb
@@ -11,8 +11,10 @@
   describe '#assigned_submissions_count' do
     it 'returns the correct count of assigned submissions' do
       create(:evaluator_submission_assignment, evaluator: evaluator, submission: submission, status: :assigned)
-      create(:evaluator_submission_assignment, evaluator: evaluator, submission: create(:submission, challenge: challenge, phase: phase), status: :assigned)
-      create(:evaluator_submission_assignment, evaluator: evaluator, submission: create(:submission, challenge: challenge, phase: phase), status: :assigned)
+      create(:evaluator_submission_assignment, evaluator: evaluator,
+                                               submission: create(:submission, challenge: challenge, phase: phase), status: :assigned)
+      create(:evaluator_submission_assignment, evaluator: evaluator,
+                                               submission: create(:submission, challenge: challenge, phase: phase), status: :assigned)
 
       expect(helper.assigned_submissions_count(evaluator, challenge, phase)).to eq(3)
     end
@@ -36,15 +38,19 @@
 
     it 'does not count unassigned or recused submissions' do
       create(:evaluator_submission_assignment, evaluator: evaluator, submission: submission, status: :assigned)
-      create(:evaluator_submission_assignment, evaluator: evaluator, submission: create(:submission, challenge: challenge, phase: phase), status: :unassigned)
-      create(:evaluator_submission_assignment, evaluator: evaluator, submission: create(:submission, challenge: challenge, phase: phase), status: :recused)
+      create(:evaluator_submission_assignment, evaluator: evaluator,
+                                               submission: create(:submission, challenge: challenge, phase: phase), status: :unassigned)
+      create(:evaluator_submission_assignment, evaluator: evaluator,
+                                               submission: create(:submission, challenge: challenge, phase: phase), status: :recused)
 
       expect(helper.assigned_submissions_count(evaluator, challenge, phase)).to eq(1)
     end
   end
 
   describe '#display_score' do
-    let(:assignment) { create(:evaluator_submission_assignment, evaluator: evaluator, submission: submission, status: :assigned) }
+    let(:assignment) do
+      create(:evaluator_submission_assignment, evaluator: evaluator, submission: submission, status: :assigned)
+    end
 
     context 'when assignment is completed and has an evaluation with a total score' do
       it 'returns the total score' do
diff --git a/spec/models/evaluation_criterion_spec.rb b/spec/models/evaluation_criterion_spec.rb
index d366245b..15266ce5 100644
--- a/spec/models/evaluation_criterion_spec.rb
+++ b/spec/models/evaluation_criterion_spec.rb
@@ -19,7 +19,7 @@
 RSpec.describe EvaluationCriterion, type: :model do
   let(:challenge) { create(:challenge) }
   let(:phase) { create(:phase, challenge:) }
-  let(:evaluation_form) { create(:evaluation_form, challenge:, phase:, weighted_scoring: false) }
+  let(:evaluation_form) { create(:evaluation_form, challenge:, phase:, scale_type: "point") }
   let(:evaluation_criterion) { create(:evaluation_criterion, evaluation_form:) }
 
   describe "creating an evaluation criterion" do
diff --git a/spec/models/evaluation_form_spec.rb b/spec/models/evaluation_form_spec.rb
index 12e292cf..bd2cad8c 100644
--- a/spec/models/evaluation_form_spec.rb
+++ b/spec/models/evaluation_form_spec.rb
@@ -6,7 +6,7 @@
 #  title             :string           not null
 #  instructions      :string           not null
 #  comments_required :boolean          default(FALSE)
-#  weighted_scoring  :boolean          default(FALSE)
+#  scale_type        :string           not null
 #  closing_date      :date             not null
 #  challenge_id      :bigint           not null
 #  created_at        :datetime         not null
diff --git a/spec/requests/evaluation_forms_spec.rb b/spec/requests/evaluation_forms_spec.rb
index 46867a50..0597de66 100644
--- a/spec/requests/evaluation_forms_spec.rb
+++ b/spec/requests/evaluation_forms_spec.rb
@@ -159,22 +159,22 @@
       end
     end
 
-    context "when updating weighted scoring in scale type" do
-      it "updates the weighted_scoring attribute" do
+    context "when updating scale type to weight" do
+      it "updates the scale_type attribute" do
         create(:evaluation_criterion, evaluation_form: evaluation_form, points_or_weight: 100)
 
-        patch evaluation_form_path(evaluation_form), params: { evaluation_form: { weighted_scoring: true } }
+        patch evaluation_form_path(evaluation_form), params: { evaluation_form: { scale_type: "weight" } }
         evaluation_form.reload
-        expect(evaluation_form).to be_weighted_scoring
+        expect(evaluation_form.scale_type).to eq("weight")
       end
 
       it "fails if criteria doesn't add up to 100" do
-        evaluation_form = create(:evaluation_form, weighted_scoring: false)
+        evaluation_form = create(:evaluation_form, scale_type: "point")
         evaluation_criterion = create(:evaluation_criterion, evaluation_form:, points_or_weight: 100)
 
         patch evaluation_form_path(evaluation_form), params: {
           evaluation_form: {
-            weighted_scoring: true,
+            scale_type: "weight",
             evaluation_criteria_attributes: {
               "0" => {
                 id: evaluation_criterion.id,
@@ -186,7 +186,8 @@
 
         evaluation_form.reload
 
-        expect(evaluation_form).not_to be_weighted_scoring
+        # Scale type shouldn't change if validation fails
+        expect(evaluation_form.scale_type).to eq("point")
       end
     end
 
diff --git a/spec/requests/evaluator_submission_assignments_spec.rb b/spec/requests/evaluator_submission_assignments_spec.rb
index 6f705269..01592246 100644
--- a/spec/requests/evaluator_submission_assignments_spec.rb
+++ b/spec/requests/evaluator_submission_assignments_spec.rb
@@ -7,7 +7,9 @@
   let(:evaluator) { create(:user, role: 'evaluator') }
   let(:submission) { create(:submission, challenge: challenge, phase: phase) }
   let(:unassigned_submission) { create(:submission, challenge: challenge, phase: phase) }
-  let!(:evaluation_form) { create(:evaluation_form, phase: phase, challenge: challenge, closing_date: 1.month.from_now) }
+  let!(:evaluation_form) do
+    create(:evaluation_form, phase: phase, challenge: challenge, closing_date: 1.month.from_now)
+  end
 
   let!(:assigned_assignment) do
     create(:evaluator_submission_assignment,
@@ -46,7 +48,6 @@
   describe 'PATCH #update' do
     context 'when reassigning' do
       it 'reassigns the evaluator successfully and updates counts' do
-
         patch phase_evaluator_submission_assignment_path(phase, unassigned_assignment),
               params: { status: :assigned, evaluator_id: evaluator.id }
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 26dd5cf0..d771071f 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -75,8 +75,9 @@ def create_evaluation_form(attrs = {})
   title = attrs[:title] || "test challenge"
   challenge_id = attrs[:challenge_id] || create_challenge.id
   phase_id = attrs[:phase_id] || create_phase.id
+  scale_type = attrs[:scale_type] || "point"
   EvaluationForm.create!(title:, challenge_id:, phase_id:, instructions: "test instructions",
-                         closing_date: Date.tomorrow)
+                         closing_date: Date.tomorrow, scale_type: scale_type)
 end
 
 def create_agency(attrs = {})
diff --git a/spec/system/evaluation_form_spec.rb b/spec/system/evaluation_form_spec.rb
index 6cc66f87..fad7fa4d 100644
--- a/spec/system/evaluation_form_spec.rb
+++ b/spec/system/evaluation_form_spec.rb
@@ -60,8 +60,7 @@
 
       fill_in_full_form
 
-      # Toggle one criterion accordion then check accessibility
-      toggle_criteria_accordion(0)
+      # Check accessibility with some collapsed criteria
       check_criteria_accordion_expanded(0, false)
       expect(page).to(be_axe_clean)
 
@@ -118,62 +117,6 @@
       expect_form_phase_select_to_be_empty
     end
 
-    it "prevents form submission and focuses first missing required field" do
-      title = "Prevents form submission #{Faker::Lorem.sentence(word_count: 3)}"
-      visit new_evaluation_form_path
-
-      # Cycle through saving form, checking field focus, and filling field for all fields
-      # Check form title
-      save_form
-      expect_form_title_to_be_focused
-      fill_in_title(title)
-      # Check form phase
-      save_form
-      expect_form_phase_to_be_focused
-      select_phase(challenge.phases.first)
-      # Check form instructions
-      save_form
-      expect_form_instructions_to_be_focused
-      fill_in_instructions("Example instructions")
-      # Check scale type
-      save_form
-      expect_form_scale_type_to_be_focused
-      select_scale_type("point")
-      # Check criterion title
-      save_form
-      expect_criterion_title_to_be_focused(0)
-      fill_in_criterion_title(0, "Criterion #{Faker::Lorem.sentence(word_count: 3)}")
-      # Check criterion description
-      save_form
-      expect_criterion_description_to_be_focused(0)
-      fill_in_criterion_description(0, Faker::Lorem.sentence)
-      # Check criterion points/weight
-      save_form
-      expect_criterion_points_or_weight_to_be_focused(0)
-      fill_in_criterion_points_weight(0, 100)
-      # Check criterion scoring type
-      save_form
-      expect_criterion_scoring_type_to_be_focused(0)
-      select_criterion_scoring_type(0, "rating")
-      # Check criterion option labels
-      save_form
-      expect_criterion_option_label_to_be_focused(0, 0)
-      fill_in_criterion_option_label(0, 0, "Unlikely")
-      save_form
-      expect_criterion_option_label_to_be_focused(0, 1)
-      fill_in_criterion_option_label(0, 1, "Neutral")
-      save_form
-      expect_criterion_option_label_to_be_focused(0, 2)
-      fill_in_criterion_option_label(0, 2, "Likely")
-      # Check form end date
-      save_form
-      expect_form_end_date_to_be_focused
-      fill_in_end_date(challenge.phases.first.end_date + 1)
-
-      save_form
-      expect(page).to have_content("Evaluation Form Saved")
-    end
-
     it "contains the evaluation form data when editing after creation" do
       title = "Editing after creation"
       visit new_evaluation_form_path
@@ -193,8 +136,10 @@
 
       # Starts with 3
       expect(visible_criterion_indicies.length).to eq(3)
+      toggle_criteria_accordion(0)
       remove_criterion(0)
       expect(visible_criterion_indicies.length).to eq(2)
+      toggle_criteria_accordion(1)
       remove_criterion(1)
       expect(visible_criterion_indicies.length).to eq(1)
 
@@ -204,33 +149,6 @@
       expect(visible_criterion_indicies).to include(3)
     end
 
-    it "does not allow collapsing criteria with missing fields and collapses correct accordion" do
-      visit new_evaluation_form_path
-
-      fill_in_base_form_info
-      # Adds a second criteria to make sure the correct accordion collapses
-      fill_in_numeric_criteria_type
-
-      toggle_criteria_accordion(0)
-      # Should still be expanded because it's missing field values
-      check_criteria_accordion_expanded(0, true)
-      # Criteria title should be focused since it is required and not filled yet
-      expect_criterion_title_to_be_focused(0)
-
-      # Other criteria starts expanded
-      check_criteria_accordion_expanded(1, true)
-      # Collapse and check other accordion
-      toggle_criteria_accordion(1)
-      check_criteria_accordion_expanded(1, false)
-
-      fill_in_numeric_criteria_type(initial: true)
-      toggle_criteria_accordion(0)
-      # Should be collapsed since it is filled out
-      check_criteria_accordion_expanded(0, false)
-      # Other criteria should still be collapsed
-      check_criteria_accordion_expanded(1, false)
-    end
-
     it "shows an error if criteria points don't add up to 100 for weighted form" do
       visit new_evaluation_form_path
 
@@ -276,12 +194,14 @@
 
       select_scale_type("weighted")
 
+      save_form
+
       check_criteria_accordion_expanded(0, true)
       check_criteria_accordion_expanded(1, true)
       check_criteria_accordion_expanded(2, true)
 
       # Scale type should be weighted
-      expect_form_scale_type_to_equal(true)
+      expect_form_scale_type_to_equal("weight")
     end
 
     it "does nothing if switching to weighted scale with no value over 100" do
@@ -307,7 +227,7 @@
       check_criteria_accordion_expanded(1, false)
 
       # Scale type should be weighted
-      expect_form_scale_type_to_equal(true)
+      expect_form_scale_type_to_equal("weight")
       expect_criterion_points_or_weight_to_equal(0, 10)
       expect_criterion_points_or_weight_to_equal(1, 100)
     end
@@ -318,7 +238,7 @@
       create(:challenge, user:, is_multi_phase: true)
     end
     let(:evaluation_form) do
-      create(:evaluation_form, challenge:, phase: challenge.phases.first, weighted_scoring: true)
+      create(:evaluation_form, challenge:, phase: challenge.phases.first, scale_type: "weight")
     end
 
     before do
@@ -410,14 +330,14 @@
 
       num_criteria = evaluation_form.evaluation_criteria.length
 
-      # Make sure criteria are expanded so they can be edited if needed
-      toggle_all_criteria_accordions
-
       # Create 3 new criteria of each type
       fill_in_numeric_criteria_type
       fill_in_rating_criteria_type
       fill_in_binary_criteria_type
 
+      # Make sure criteria are expanded so they can be edited if needed
+      toggle_all_criteria_accordions
+
       rebalance_criteria_weights if evaluation_form.weighted_scoring?
       save_form
       expect(page).to have_content("Evaluation Form Saved")
@@ -463,7 +383,7 @@
   describe "evaluation form confirmation page" do
     let(:evaluation_form) do
       challenge = create(:challenge, user:, is_multi_phase: true)
-      create(:evaluation_form, challenge:, phase: challenge.phases.first, weighted_scoring: true)
+      create(:evaluation_form, challenge:, phase: challenge.phases.first, scale_type: "weight")
     end
 
     before do
@@ -749,7 +669,7 @@ def expect_base_form_field_to_match(evaluation_form)
   expect_form_phase_to_equal(challenge_phase_title(phase.challenge, phase))
   expect_form_instructions_to_equal(evaluation_form.instructions)
   expect_form_comments_required_to_equal(evaluation_form.comments_required)
-  expect_form_scale_type_to_equal(evaluation_form.weighted_scoring?)
+  expect_form_scale_type_to_equal(evaluation_form.scale_type)
   expect_form_end_date_to_equal(evaluation_form.closing_date.strftime("%m/%d/%Y"))
 end
 
@@ -821,9 +741,8 @@ def expect_form_comments_required_to_equal(value)
   expect(find_by_id('evaluation_form_comments_required', visible: :all).checked?).to eq(value)
 end
 
-# value = false for point scale, true for weighted scale
 def expect_form_scale_type_to_equal(value)
-  expect(find("input[name='evaluation_form[weighted_scoring]'][value='#{value}']", visible: :all)).to be_checked
+  expect(find("input[name='evaluation_form[scale_type]'][value='#{value}']", visible: :all)).to be_checked
 end
 
 def expect_form_end_date_to_equal(value)
diff --git a/spec/system/evaluator_submission_assignment_spec.rb b/spec/system/evaluator_submission_assignment_spec.rb
index 9d02c722..abb55a43 100644
--- a/spec/system/evaluator_submission_assignment_spec.rb
+++ b/spec/system/evaluator_submission_assignment_spec.rb
@@ -1,12 +1,14 @@
 require 'rails_helper'
 
-RSpec.describe 'Evaluator Submission Assignments', type: :system, js: true do
+RSpec.describe 'Evaluator Submission Assignments', :js, type: :system do
   let(:user) { create_user(role: "challenge_manager", status: "active") }
   let(:challenge) { create(:challenge) }
   let(:phase) { create(:phase, challenge: challenge) }
   let(:evaluator) { create(:user, role: 'evaluator') }
   let(:submission) { create(:submission, phase: phase) }
-  let!(:evaluation_form) { create(:evaluation_form, phase: phase, challenge: challenge, closing_date: 1.month.from_now) }
+  let!(:evaluation_form) do
+    create(:evaluation_form, phase: phase, challenge: challenge, closing_date: 1.month.from_now)
+  end
 
   before do
     ChallengeManager.create!(user: user, challenge: challenge)
@@ -20,7 +22,7 @@
     expect(page).to be_axe_clean
   end
 
-  it 'allows unassigning a submission from an evaluator', js: true do
+  it 'allows unassigning a submission from an evaluator', :js do
     assigned_assignment = create(
       :evaluator_submission_assignment,
       submission: submission,
@@ -35,7 +37,7 @@
     expect(unassign_button).to be_visible
     unassign_button.click
 
-    expect(page).to have_selector('#unassign-evaluator-submission-modal', visible: true)
+    expect(page).to have_css('#unassign-evaluator-submission-modal', visible: true)
     expect(page).to have_content('Are you sure you want to unassign an evaluator from this submission?')
 
     within('#unassign-evaluator-submission-modal') do
diff --git a/spec/system/submissions_spec.rb b/spec/system/submissions_spec.rb
index 5367bba8..c6a55575 100644
--- a/spec/system/submissions_spec.rb
+++ b/spec/system/submissions_spec.rb
@@ -11,7 +11,7 @@
     it "manage submissions by challenge phase page is accessible with one challenge" do
       challenge = create_challenge(user: user, title: "Boston Tea Party Cleanup")
       phase = create_phase(challenge_id: challenge.id)
-      submission = create(:submission, manager: user, challenge: challenge, phase: phase)
+      create(:submission, manager: user, challenge: challenge, phase: phase)
 
       visit submissions_phase_path(phase)
       expect(user.role).to eq("challenge_manager")