diff --git a/lib/arrow/disruptions/limit.ex b/lib/arrow/disruptions/limit.ex
index 294979b20..58b1f3ef2 100644
--- a/lib/arrow/disruptions/limit.ex
+++ b/lib/arrow/disruptions/limit.ex
@@ -44,7 +44,7 @@ defmodule Arrow.Disruptions.Limit do
     ])
     |> put_change(:check_for_overlap, true)
     |> validate_required([:start_date, :end_date, :route_id, :start_stop_id, :end_stop_id])
-    |> validate_start_date_before_end_date()
+    |> Arrow.Util.Validation.validate_start_date_before_end_date()
     |> cast_assoc_day_of_weeks()
     |> exclusion_constraint(:end_date,
       name: :no_overlap,
@@ -73,23 +73,6 @@ defmodule Arrow.Disruptions.Limit do
     |> struct!(attrs)
   end
 
-  @spec validate_start_date_before_end_date(Ecto.Changeset.t(t())) :: Ecto.Changeset.t(t())
-  defp validate_start_date_before_end_date(changeset) do
-    start_date = get_field(changeset, :start_date)
-    end_date = get_field(changeset, :end_date)
-
-    cond do
-      is_nil(start_date) or is_nil(end_date) ->
-        changeset
-
-      Date.compare(start_date, end_date) == :gt ->
-        add_error(changeset, :start_date, "start date should not be after end date")
-
-      true ->
-        changeset
-    end
-  end
-
   @spec cast_assoc_day_of_weeks(Ecto.Changeset.t(t())) :: Ecto.Changeset.t(t())
   defp cast_assoc_day_of_weeks(changeset) do
     start_date = get_field(changeset, :start_date)
diff --git a/lib/arrow/disruptions/replacement_service.ex b/lib/arrow/disruptions/replacement_service.ex
index 2fd406191..b48c43dd4 100644
--- a/lib/arrow/disruptions/replacement_service.ex
+++ b/lib/arrow/disruptions/replacement_service.ex
@@ -52,28 +52,11 @@ defmodule Arrow.Disruptions.ReplacementService do
       :disruption_id,
       :shuttle_id
     ])
-    |> validate_start_date_before_end_date()
+    |> Arrow.Util.Validation.validate_start_date_before_end_date()
     |> assoc_constraint(:shuttle)
     |> assoc_constraint(:disruption)
   end
 
-  @spec validate_start_date_before_end_date(Ecto.Changeset.t(t())) :: Ecto.Changeset.t(t())
-  defp validate_start_date_before_end_date(changeset) do
-    start_date = get_field(changeset, :start_date)
-    end_date = get_field(changeset, :end_date)
-
-    cond do
-      is_nil(start_date) or is_nil(end_date) ->
-        changeset
-
-      Date.compare(start_date, end_date) == :gt ->
-        add_error(changeset, :start_date, "start date should not be after end date")
-
-      true ->
-        changeset
-    end
-  end
-
   def add_timetable(%__MODULE__{} = replacement_service) do
     timetable =
       schedule_service_types()
diff --git a/lib/arrow/gtfs/calendar.ex b/lib/arrow/gtfs/calendar.ex
index d0ce45da8..696e3f986 100644
--- a/lib/arrow/gtfs/calendar.ex
+++ b/lib/arrow/gtfs/calendar.ex
@@ -33,18 +33,7 @@ defmodule Arrow.Gtfs.Calendar do
       ~w[service_id monday tuesday wednesday thursday friday saturday sunday start_date end_date]a
     )
     |> assoc_constraint(:service)
-    |> validate_start_date_not_after_end_date()
-  end
-
-  defp validate_start_date_not_after_end_date(changeset) do
-    start_date = fetch_field!(changeset, :start_date)
-    end_date = fetch_field!(changeset, :end_date)
-
-    if Date.compare(start_date, end_date) in [:lt, :eq] do
-      changeset
-    else
-      add_error(changeset, :dates, "start date should not be after end date")
-    end
+    |> Arrow.Util.Validation.validate_start_date_before_end_date()
   end
 
   @impl Arrow.Gtfs.Importable
diff --git a/lib/arrow/gtfs/feed_info.ex b/lib/arrow/gtfs/feed_info.ex
index 6f36e6974..f6d792bc3 100644
--- a/lib/arrow/gtfs/feed_info.ex
+++ b/lib/arrow/gtfs/feed_info.ex
@@ -32,18 +32,7 @@ defmodule Arrow.Gtfs.FeedInfo do
     |> validate_required(
       ~w[id publisher_name publisher_url lang start_date end_date version contact_email]a
     )
-    |> validate_start_date_before_end_date()
-  end
-
-  defp validate_start_date_before_end_date(changeset) do
-    start_date = fetch_field!(changeset, :start_date)
-    end_date = fetch_field!(changeset, :end_date)
-
-    if Date.compare(start_date, end_date) == :lt do
-      changeset
-    else
-      add_error(changeset, :dates, "start date should be before end date")
-    end
+    |> Arrow.Util.Validation.validate_start_date_before_end_date()
   end
 
   @impl Arrow.Gtfs.Importable
diff --git a/lib/arrow/hastus/service_date.ex b/lib/arrow/hastus/service_date.ex
index 2d11ab910..764d64e4a 100644
--- a/lib/arrow/hastus/service_date.ex
+++ b/lib/arrow/hastus/service_date.ex
@@ -17,7 +17,7 @@ defmodule Arrow.Hastus.ServiceDate do
     service_date
     |> cast(attrs, [:start_date, :end_date, :service_id])
     |> validate_required([:start_date, :end_date])
-    |> validate_start_date_before_end_date()
+    |> Arrow.Util.Validation.validate_start_date_before_end_date()
     |> assoc_constraint(:service)
   end
 
@@ -31,21 +31,4 @@ defmodule Arrow.Hastus.ServiceDate do
     |> Stream.take(7)
     |> MapSet.new(&Date.day_of_week/1)
   end
-
-  @spec validate_start_date_before_end_date(Ecto.Changeset.t(t())) :: Ecto.Changeset.t(t())
-  defp validate_start_date_before_end_date(changeset) do
-    start_date = get_field(changeset, :start_date)
-    end_date = get_field(changeset, :end_date)
-
-    cond do
-      is_nil(start_date) or is_nil(end_date) ->
-        changeset
-
-      Date.compare(start_date, end_date) == :gt ->
-        add_error(changeset, :start_date, "start date must be less than or equal to end date")
-
-      true ->
-        changeset
-    end
-  end
 end
diff --git a/lib/arrow/trainsformer/service.ex b/lib/arrow/trainsformer/service.ex
index 46e08bff9..a31539235 100644
--- a/lib/arrow/trainsformer/service.ex
+++ b/lib/arrow/trainsformer/service.ex
@@ -23,8 +23,12 @@ defmodule Arrow.Trainsformer.Service do
   def changeset(service, attrs) do
     service
     |> cast(attrs, [:name, :export_id])
+    |> cast_assoc(:service_dates,
+      with: &ServiceDate.changeset/2,
+      sort_param: :service_dates_sort,
+      drop_param: :service_dates_drop
+    )
     |> validate_required([:name])
-    |> cast_assoc(:service_dates, with: &ServiceDate.changeset/2)
     |> assoc_constraint(:export)
   end
 end
diff --git a/lib/arrow/trainsformer/service_date.ex b/lib/arrow/trainsformer/service_date.ex
index 948db3b90..9d4f4cdf4 100644
--- a/lib/arrow/trainsformer/service_date.ex
+++ b/lib/arrow/trainsformer/service_date.ex
@@ -6,8 +6,8 @@ defmodule Arrow.Trainsformer.ServiceDate do
   alias Arrow.Trainsformer.ServiceDateDayOfWeek
 
   typed_schema "trainsformer_service_dates" do
-    field :start_date, :date
-    field :end_date, :date
+    field :start_date, :date, default: Date.utc_today()
+    field :end_date, :date, default: Date.utc_today()
     belongs_to :service, Arrow.Trainsformer.Service, on_replace: :delete
 
     has_many :service_date_days_of_week, ServiceDateDayOfWeek,
@@ -39,6 +39,7 @@ defmodule Arrow.Trainsformer.ServiceDate do
     |> cast(transformed_attrs, [:start_date, :end_date, :service_id])
     |> cast_assoc(:service_date_days_of_week, with: &ServiceDateDayOfWeek.changeset/2)
     |> validate_required([:start_date, :end_date])
+    |> Arrow.Util.Validation.validate_start_date_before_end_date()
     |> assoc_constraint(:service)
   end
 end
diff --git a/lib/arrow/util/validation.ex b/lib/arrow/util/validation.ex
new file mode 100644
index 000000000..fcde4e06c
--- /dev/null
+++ b/lib/arrow/util/validation.ex
@@ -0,0 +1,26 @@
+defmodule Arrow.Util.Validation do
+  @moduledoc """
+  Utilities for validating changesets in Arrow. Note that many these functions make assumptions
+  about the field names / error messages in your changeset that are specific to this project.
+  """
+  @spec validate_start_date_before_end_date(Ecto.Changeset.t(any())) :: Ecto.Changeset.t(any())
+  def validate_start_date_before_end_date(changeset) do
+    start_date = Ecto.Changeset.get_field(changeset, :start_date)
+    end_date = Ecto.Changeset.get_field(changeset, :end_date)
+
+    cond do
+      is_nil(start_date) or is_nil(end_date) ->
+        changeset
+
+      Date.compare(start_date, end_date) == :gt ->
+        Ecto.Changeset.add_error(
+          changeset,
+          :start_date,
+          "start date must be less than or equal to end date"
+        )
+
+      true ->
+        changeset
+    end
+  end
+end
diff --git a/lib/arrow_web/components/core_components.ex b/lib/arrow_web/components/core_components.ex
index 37e9a98a6..3fdfbf028 100644
--- a/lib/arrow_web/components/core_components.ex
+++ b/lib/arrow_web/components/core_components.ex
@@ -77,7 +77,7 @@ defmodule ArrowWeb.CoreComponents do
                 <button
                   phx-click={JS.exec("data-cancel", to: "##{@id}")}
                   type="button"
-                  class="-m-3 flex-none p-3 opacity-20 hover:opacity-40"
+                  class="-m-3 flex-none p-3 opacity-20 hover:opacity-140"
                   aria-label={gettext("close")}
                 >
                   <.icon name="hero-x-mark-solid" class="h-5 w-5" />
diff --git a/lib/arrow_web/components/disruption_components.ex b/lib/arrow_web/components/disruption_components.ex
index 11217d718..6aacff597 100644
--- a/lib/arrow_web/components/disruption_components.ex
+++ b/lib/arrow_web/components/disruption_components.ex
@@ -329,7 +329,7 @@ defmodule ArrowWeb.DisruptionComponents do
                   <div class="text-right">
                     <.link
                       :if={!@editing}
-                      id={"edit-export-button-#{export.id}"}
+                      id={"edit-hastus-export-button-#{export.id}"}
                       class="btn-sm p-0"
                       patch={~p"/disruptions/#{@disruption.id}/hastus_export/#{export.id}/edit"}
                     >
@@ -337,10 +337,10 @@ defmodule ArrowWeb.DisruptionComponents do
                     </.link>
                     <.button
                       :if={!@editing}
-                      id={"delete-export-button-#{export.id}"}
+                      id={"delete-hastus-export-button-#{export.id}"}
                       class="btn-sm p-0"
                       type="button"
-                      phx-click="delete_export"
+                      phx-click="delete_hastus_export"
                       phx-value-export={export.id}
                       data-confirm="Are you sure you want to delete this export?"
                     >
@@ -493,22 +493,22 @@ defmodule ArrowWeb.DisruptionComponents do
               <div class="col-12 text-right">
                 <.link
                   :if={!@editing}
-                  id={"edit-export-button-#{export.id}"}
+                  id={"edit-trainsformer-export-button-#{export.id}"}
                   class="btn-sm p-0"
                   patch={~p"/disruptions/#{@disruption.id}/trainsformer_export/#{export.id}/edit"}
                 >
-                  <.icon name="hero-pencil-solid" class="bg-primary" />
+                  <.icon name="hero-pencil-solid" class="bg-primary hover:opacity-140" />
                 </.link>
                 <.button
                   :if={!@editing}
-                  id={"delete-export-button-#{export.id}"}
+                  id={"delete-trainsformer-export-button-#{export.id}"}
                   class="btn-sm p-0"
                   type="button"
-                  phx-click="delete_export"
+                  phx-click="delete_trainsformer_export"
                   phx-value-export={export.id}
                   data-confirm="Are you sure you want to delete this export?"
                 >
-                  <.icon name="hero-trash-solid" class="bg-primary" />
+                  <.icon name="hero-trash-solid" class="bg-primary hover:opacity-140" />
                 </.button>
               </div>
             </div>
diff --git a/lib/arrow_web/components/edit_trainsformer_export_form.ex b/lib/arrow_web/components/edit_trainsformer_export_form.ex
index fde05df77..e7bafb7c4 100644
--- a/lib/arrow_web/components/edit_trainsformer_export_form.ex
+++ b/lib/arrow_web/components/edit_trainsformer_export_form.ex
@@ -7,7 +7,6 @@ defmodule ArrowWeb.EditTrainsformerExportForm do
   alias Arrow.Trainsformer
   alias Arrow.Trainsformer.Export
   alias Arrow.Trainsformer.ExportUpload
-  alias Arrow.Trainsformer.ServiceDate
   alias Arrow.Trainsformer.ServiceDateDayOfWeek
   alias Phoenix.LiveView.UploadEntry
 
@@ -152,6 +151,11 @@ defmodule ArrowWeb.EditTrainsformerExportForm do
                   </div>
                   <div class="col-lg-9 text-md">
                     <.inputs_for :let={f_date} field={f_service[:service_dates]}>
+                      <input
+                        type="hidden"
+                        name={Phoenix.HTML.Form.input_name(f_service, :service_dates_sort) <> "[]"}
+                        value={f_date.index}
+                      />
                       {f_service[:start_date].value}
                       <div class="row">
                         <div class="col">
@@ -214,15 +218,15 @@ defmodule ArrowWeb.EditTrainsformerExportForm do
                           </div>
                         </div>
                         <div class="col">
-                          <.button
-                            type="button"
-                            phx-click="delete_service_date"
-                            phx-value-service_index={f_service.index}
-                            phx-value-date_index={f_date.index}
-                            phx-target={@myself}
-                          >
+                          <label class="cursor-pointer hover:opacity-140">
                             <.icon name="hero-trash-solid" class="bg-primary" />
-                          </.button>
+                            <input
+                              type="checkbox"
+                              name={Phoenix.HTML.Form.input_name(f_service, :service_dates_drop) <> "[]"}
+                              class="hidden"
+                              value={f_date.index}
+                            />
+                          </label>
                         </div>
                       </div>
                       <div class="row">
@@ -239,15 +243,15 @@ defmodule ArrowWeb.EditTrainsformerExportForm do
 
                 <div class="row mt-3">
                   <div class="col-9" />
-                  <.button
-                    type="button"
-                    class="btn h-15 w-15 btn-primary btn-sm "
-                    value={f_service.index}
-                    phx-click="add_service_date"
-                    phx-target={@myself}
-                  >
+                  <label class="btn h-15 w-15 btn-primary btn-sm">
                     Add Another Timeframe
-                  </.button>
+                    <input
+                      type="checkbox"
+                      name={Phoenix.HTML.Form.input_name(f_service, :service_dates_sort) <> "[]"}
+                      class="hidden"
+                      value="new"
+                    />
+                  </label>
                 </div>
               </.inputs_for>
             </div>
@@ -426,60 +430,6 @@ defmodule ArrowWeb.EditTrainsformerExportForm do
     {:noreply, socket}
   end
 
-  def handle_event("add_service_date", %{"value" => index}, socket) do
-    {index, _} = Integer.parse(index)
-
-    socket =
-      update(socket, :form, fn %{source: changeset} ->
-        updated_services =
-          changeset
-          |> Ecto.Changeset.get_assoc(:services)
-          |> update_in([Access.at(index)], fn service ->
-            existing_dates = Ecto.Changeset.get_assoc(service, :service_dates)
-
-            Ecto.Changeset.put_change(
-              service,
-              :service_dates,
-              existing_dates ++ [%ServiceDate{service_date_days_of_week: []}]
-            )
-          end)
-
-        changeset
-        |> Ecto.Changeset.put_assoc(:services, updated_services)
-        |> to_form()
-      end)
-
-    {:noreply, socket}
-  end
-
-  def handle_event(
-        "delete_service_date",
-        %{"service_index" => service_index, "date_index" => date_index},
-        socket
-      ) do
-    {service_index, _} = Integer.parse(service_index)
-    {date_index, _} = Integer.parse(date_index)
-
-    socket =
-      update(socket, :form, fn %{source: changeset} ->
-        updated_services =
-          changeset
-          |> Ecto.Changeset.get_assoc(:services)
-          |> update_in([Access.at(service_index)], fn service ->
-            dates =
-              service |> Ecto.Changeset.get_assoc(:service_dates) |> List.delete_at(date_index)
-
-            Ecto.Changeset.put_change(service, :service_dates, dates)
-          end)
-
-        changeset
-        |> Ecto.Changeset.put_assoc(:services, updated_services)
-        |> to_form()
-      end)
-
-    {:noreply, socket}
-  end
-
   defp handle_progress(:trainsformer_export, %UploadEntry{done?: false}, socket) do
     {:noreply, socket}
   end
diff --git a/lib/arrow_web/live/disruption_v2_live/disruption_v2_view_live.ex b/lib/arrow_web/live/disruption_v2_live/disruption_v2_view_live.ex
index 9f1de0da9..873a0fa45 100644
--- a/lib/arrow_web/live/disruption_v2_live/disruption_v2_view_live.ex
+++ b/lib/arrow_web/live/disruption_v2_live/disruption_v2_view_live.ex
@@ -111,7 +111,7 @@ defmodule ArrowWeb.DisruptionV2ViewLive do
     end
   end
 
-  def handle_event("delete_export", %{"export" => export_id}, socket) do
+  def handle_event("delete_hastus_export", %{"export" => export_id}, socket) do
     {parsed_id, _} = Integer.parse(export_id)
     export = Hastus.get_export!(parsed_id)
 
diff --git a/test/integration/disruptionsv2/hastus_export_section_test.exs b/test/integration/disruptionsv2/hastus_export_section_test.exs
index 112aa43cd..9ef9071cc 100644
--- a/test/integration/disruptionsv2/hastus_export_section_test.exs
+++ b/test/integration/disruptionsv2/hastus_export_section_test.exs
@@ -72,7 +72,7 @@ defmodule Arrow.Integration.Disruptionsv2.HastusExportSectionTest do
     |> visit("/disruptions/#{disruption.id}")
     |> scroll_down()
     |> assert_text("some-Weekday-service")
-    |> click(Query.css("#edit-export-button-#{export.id}"))
+    |> click(Query.css("#edit-hastus-export-button-#{export.id}"))
     |> assert_text("edit service schedule")
     |> scroll_down()
     |> click(Query.css("#import-checkbox-0"))
@@ -106,7 +106,7 @@ defmodule Arrow.Integration.Disruptionsv2.HastusExportSectionTest do
     |> visit("/disruptions/#{disruption.id}")
     |> scroll_down()
     |> assert_text("some-Weekday-service")
-    |> click(Query.css("#edit-export-button-#{export.id}"))
+    |> click(Query.css("#edit-hastus-export-button-#{export.id}"))
     |> assert_text("edit service schedule")
     |> scroll_down()
     |> click(Query.css("#import-checkbox-0"))
@@ -124,7 +124,7 @@ defmodule Arrow.Integration.Disruptionsv2.HastusExportSectionTest do
     |> visit("/disruptions/#{disruption.id}")
     |> scroll_down()
     |> assert_text("some-Weekday-service")
-    |> click(Query.css("#delete-export-button-#{export.id}"))
+    |> click(Query.css("#delete-hastus-export-button-#{export.id}"))
     |> refute_has(Query.css("#export-table-hastus-#{export.id}"))
   end
 
diff --git a/test/integration/disruptionsv2/trainsformer_export_section_test.exs b/test/integration/disruptionsv2/trainsformer_export_section_test.exs
index 48c9e4ac1..6280fc685 100644
--- a/test/integration/disruptionsv2/trainsformer_export_section_test.exs
+++ b/test/integration/disruptionsv2/trainsformer_export_section_test.exs
@@ -282,30 +282,43 @@ defmodule Arrow.Integration.Disruptionsv2.TrainsformerExportSectionTest do
 
     [%{id: export_id} | _] = disruption.trainsformer_exports
 
-    session
-    |> visit("/disruptions/#{disruption.id}/")
-    |> click(Query.css("#edit-export-button-#{export_id}"))
-    |> click(Query.checkbox("Wednesday"))
-    |> fill_in(
-      Query.fillable_field("End Date"),
-      with: "01/28/2026"
-    )
-    |> click(text("Add Another Timeframe"))
-    |> fill_in("Start Date" |> Query.fillable_field() |> Query.at(1), with: "01/30/2026")
-    |> fill_in("End Date" |> Query.fillable_field() |> Query.at(1), with: "02/05/2026")
-    |> click("Monday" |> Query.checkbox() |> Query.at(1))
+    session_before_delete =
+      session
+      |> visit("/disruptions/#{disruption.id}/")
+      |> click(Query.css("#edit-trainsformer-export-button-#{export_id}"))
+      |> click(Query.checkbox("Wednesday"))
+      |> fill_in(
+        Query.fillable_field("End Date"),
+        with: "01/28/2026"
+      )
+      |> click(text("Add Another Timeframe"))
+      |> fill_in("Start Date" |> Query.fillable_field() |> Query.at(1), with: "01/30/2026")
+      |> fill_in("End Date" |> Query.fillable_field() |> Query.at(1), with: "02/05/2026")
+      |> click("Monday" |> Query.checkbox() |> Query.at(1))
+      |> click(text("Save"))
+      |> assert_text("Trainsformer service schedules updated successfully!")
+      |> assert_text("01/21/2026")
+      |> assert_text("01/28/2026")
+      |> assert_text("01/30/2026")
+      |> assert_text("02/05/2026")
+      |> assert_has(".text-primary[name=\"day-of-week-monday\"]" |> Query.css() |> Query.count(2))
+      |> assert_has(
+        ".text-primary[name=\"day-of-week-tuesday\"]"
+        |> Query.css()
+        |> Query.count(1)
+      )
+      |> assert_has(
+        ".text-primary[name=\"day-of-week-wednesday\"]"
+        |> Query.css()
+        |> Query.count(1)
+      )
+
+    # delete second service date
+    session_before_delete
+    |> click(Query.css("#edit-trainsformer-export-button-#{export_id}"))
+    |> click("label span.hero-trash-solid" |> Query.css() |> Query.at(1))
     |> click(text("Save"))
-    |> assert_text("Trainsformer service schedules updated successfully!")
-    |> assert_text("01/21/2026")
-    |> assert_text("01/28/2026")
-    |> assert_text("01/30/2026")
-    |> assert_text("02/05/2026")
-    |> assert_has(".text-primary[name=\"day-of-week-monday\"]" |> Query.css() |> Query.count(2))
-    |> assert_has(".text-primary[name=\"day-of-week-tuesday\"]" |> Query.css() |> Query.count(1))
-    |> assert_has(
-      ".text-primary[name=\"day-of-week-wednesday\"]"
-      |> Query.css()
-      |> Query.count(1)
-    )
+    |> refute_has(text("01/30/2026"))
+    |> refute_has(text("02/05/2026"))
   end
 end