diff --git a/Gemfile b/Gemfile
index 960b25729..d08ba4763 100644
--- a/Gemfile
+++ b/Gemfile
@@ -104,10 +104,10 @@ gem "ransack"
 gem "rails-controller-testing"
 
 # Use Action Policy for authorization framework
-gem "action_policy", "~> 0.7.2"
+gem "action_policy", "~> 0.7.3"
 
 # Use ViewComponent for our presenter pattern framework
-gem "view_component", "~> 3.20"
+gem "view_component", "~> 3.21"
 
 # Use dry-types for defining types
 gem "dry-types", "~> 1.7"
diff --git a/Gemfile.lock b/Gemfile.lock
index 5b21fb911..dcbf0bcfa 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    action_policy (0.7.2)
+    action_policy (0.7.3)
       ruby-next-core (>= 1.0)
     actioncable (8.0.1)
       actionpack (= 8.0.1)
@@ -146,7 +146,7 @@ GEM
       railties (>= 6.0.0)
       sass-embedded (~> 1.63)
     date (3.4.1)
-    debug (1.9.2)
+    debug (1.10.0)
       irb (~> 1.10)
       reline (>= 0.3.8)
     devise (4.9.4)
@@ -277,7 +277,7 @@ GEM
       activesupport (>= 6.0.0)
       railties (>= 6.0.0)
     io-console (0.8.0)
-    irb (1.14.2)
+    irb (1.14.3)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jbuilder (2.13.0)
@@ -310,7 +310,7 @@ GEM
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.6.3)
+    logger (1.6.4)
     loofah (2.23.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -439,7 +439,7 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rdoc (6.9.1)
+    rdoc (6.10.0)
       psych (>= 4.0.0)
     regexp_parser (2.9.3)
     reline (0.6.0)
@@ -542,7 +542,7 @@ GEM
     unicode-emoji (4.0.4)
     uri (1.0.2)
     useragent (0.16.11)
-    view_component (3.20.0)
+    view_component (3.21.0)
       activesupport (>= 5.2.0, < 8.1)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)
@@ -570,7 +570,7 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  action_policy (~> 0.7.2)
+  action_policy (~> 0.7.3)
   active_link_to
   active_storage_validations
   acts_as_tenant
@@ -625,7 +625,7 @@ DEPENDENCIES
   traceroute
   turbo-rails
   tzinfo-data
-  view_component (~> 3.20)
+  view_component (~> 3.21)
   web-console
 
 RUBY VERSION
diff --git a/app/controllers/contacts_controller.rb b/app/controllers/contacts_controller.rb
index 9e60c609b..9725ea9fa 100644
--- a/app/controllers/contacts_controller.rb
+++ b/app/controllers/contacts_controller.rb
@@ -4,6 +4,7 @@ class ContactsController < ApplicationController
 
   def new
     @contact = Contact.new
+    @contact.email = current_user.email if current_user.present?
   end
 
   def create
diff --git a/app/controllers/feedback_controller.rb b/app/controllers/feedback_controller.rb
index c03ecac77..749e75fd3 100644
--- a/app/controllers/feedback_controller.rb
+++ b/app/controllers/feedback_controller.rb
@@ -7,6 +7,7 @@ class FeedbackController < ApplicationController
 
   def new
     @feedback = Feedback.new
+    @feedback.email = current_user.email if current_user.present?
   end
 
   def create
diff --git a/app/controllers/organizations/staff/external_form_upload_controller.rb b/app/controllers/organizations/staff/external_form_upload_controller.rb
index 0e209ab92..6e759f42f 100644
--- a/app/controllers/organizations/staff/external_form_upload_controller.rb
+++ b/app/controllers/organizations/staff/external_form_upload_controller.rb
@@ -11,8 +11,15 @@ def index
 
       def create
         authorize! :external_form_upload, context: {organization: Current.organization}
-        import = Organizations::Importers::CsvImportService.new(params[:files]).call
-        render turbo_stream: turbo_stream.replace("results", partial: "organizations/staff/external_form_upload/upload_results", locals: {import: import})
+        file = params[:files]
+        @blob = ActiveStorage::Blob.create_and_upload!(io: file, filename: file.original_filename)
+
+        CsvImportJob.perform_later(@blob.signed_id, current_user.id)
+
+        flash.now[:notice] = t(".processing_file")
+        respond_to do |format|
+          format.turbo_stream
+        end
       end
     end
   end
diff --git a/app/jobs/csv_import_job.rb b/app/jobs/csv_import_job.rb
new file mode 100644
index 000000000..1a97e0128
--- /dev/null
+++ b/app/jobs/csv_import_job.rb
@@ -0,0 +1,11 @@
+class CsvImportJob < ApplicationJob
+  queue_as :default
+
+  def perform(blob_signed_id, current_user_id)
+    blob = ActiveStorage::Blob.find_signed(blob_signed_id)
+
+    Organizations::Importers::CsvImportService.new(blob, current_user_id).call
+  ensure
+    blob.purge_later
+  end
+end
diff --git a/app/models/contact.rb b/app/models/contact.rb
index 091b5b7cd..05eb07764 100644
--- a/app/models/contact.rb
+++ b/app/models/contact.rb
@@ -2,7 +2,8 @@ class Contact
   include ActiveModel::Model
   attr_accessor :name, :email, :message
 
-  validates :name, :email, :message, presence: true
+  validates :name, :email, presence: true
+  validates :message, presence: true, length: {maximum: 500}
 
   # credit: https://medium.com/@limichelle21/building-and-debugging-a-contact-form-with-rails-mailgun-heroku-c0185b8bf419
 end
diff --git a/app/models/organization_account_request.rb b/app/models/organization_account_request.rb
index 1d1eb659c..85b64b116 100644
--- a/app/models/organization_account_request.rb
+++ b/app/models/organization_account_request.rb
@@ -5,7 +5,7 @@ class OrganizationAccountRequest
 
   before_validation :normalize_phone
 
-  validates :name, :email, :city_town, :country, :province_state, presence: true
+  validates :name, :email, :requester_name, :city_town, :country, :province_state, presence: true
   validates_format_of :email, with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i
   validates :phone_number, presence: true, phone: {possible: true, allow_blank: true}
 
diff --git a/app/services/organizations/create_service.rb b/app/services/organizations/create_service.rb
index 8a4f2ebfe..599bba598 100644
--- a/app/services/organizations/create_service.rb
+++ b/app/services/organizations/create_service.rb
@@ -1,11 +1,12 @@
-# class to create a new location, organization, user, and staff account with role admin
-# email is sent to admin user if all steps are successful
+# Class to create a new location, organization, user, and staff account with role admin.
+# An email is sent to admin user if all steps are successful.
+# Be sure to use the Country and State codes from countries_states.yml
 # call with Organizations::CreateService.new.signal(args)
 # sample args:
 # {
 #   location: {
-#     country: 'Mexico',
-#     city_town: 'La Ventana',
+#     country: 'MX',
+#     city_town: 'JAL',
 #     province_state: 'Baja'
 #   },
 #   organization: {
diff --git a/app/services/organizations/importers/csv_import_service.rb b/app/services/organizations/importers/csv_import_service.rb
index 54d78b32f..da0faf5af 100644
--- a/app/services/organizations/importers/csv_import_service.rb
+++ b/app/services/organizations/importers/csv_import_service.rb
@@ -4,9 +4,10 @@ module Organizations
   module Importers
     class CsvImportService
       Status = Data.define(:success?, :count, :no_match, :errors)
-      def initialize(file)
+      def initialize(file, current_user_id)
         @file = file
-        @organization = Current.organization
+        @organization = ActsAsTenant.current_tenant
+        @current_user = User.find(current_user_id)
         @count = 0
         @no_match = []
         @errors = []
@@ -14,51 +15,55 @@ def initialize(file)
 
       def call
         catch(:halt_import) do
-          validate_file
-
-          CSV.foreach(@file.to_path, headers: true, skip_blanks: true).with_index(2) do |row, index|
-            # Header may be different depending on which form applicaiton was used(e.g. google forms) or how it was created(User creates form with "Email Address")
-            email = row[@email_header].downcase
-            # Google forms uses "Timestamp", other services may use a different header
-            csv_timestamp = Time.parse(row["Timestamp"]) if row["Timestamp"].present?
-
-            person = Person.find_by(email:, organization: @organization)
-            previously_matched_form_submission = FormSubmission.where(person:, csv_timestamp:)
-
-            if person.nil?
-              @no_match << [index, email]
-            elsif previously_matched_form_submission.present?
-              next
-            else
-              ActiveRecord::Base.transaction do
-                create_form_answers(FormSubmission.create!(person:, csv_timestamp:), row)
-                @count += 1
+          @file.download do |data|
+            validate_file(data)
+            CSV.parse(data, headers: true, skip_blanks: true).each_with_index do |row, index|
+              # Header may be different depending on which form applicaiton was used(e.g. google forms) or how it was created(User creates form with "Email Address")
+              email = row[@email_header].downcase
+              # Google forms uses "Timestamp", other services may use a different header
+              csv_timestamp = Time.parse(row["Timestamp"]) if row["Timestamp"].present?
+
+              person = Person.find_by(email:, organization: @organization)
+              previously_matched_form_submission = FormSubmission.where(person:, csv_timestamp:)
+
+              if person.nil?
+                @no_match << [index + 2, email]
+              elsif previously_matched_form_submission.present?
+                next
+              else
+                ActiveRecord::Base.transaction do
+                  create_form_answers(FormSubmission.create!(person:, csv_timestamp:), row)
+                  @count += 1
+                end
               end
+            rescue => e
+              @errors << [index + 2, e]
             end
-          rescue => e
-            @errors << [index, e]
           end
         end
-        Status.new(@errors.empty?, @count, @no_match, @errors)
+        Turbo::StreamsChannel.broadcast_replace_to ["csv_import", @current_user],
+          target: "results",
+          partial: "organizations/staff/external_form_upload/upload_results",
+          locals: {
+            import: Status.new(@errors.empty?, @count, @no_match, @errors)
+          }
       end
 
       private
 
-      def validate_file
+      def validate_file(data)
         raise FileTypeError unless @file.content_type == "text/csv"
-
-        first_row = CSV.foreach(@file.to_path).first
-        raise FileEmptyError if first_row.nil?
+        first_row = CSV.new(data).shift
 
         raise TimestampColumnError unless first_row.include?("Timestamp")
 
         email_headers = ["Email", "email", "Email Address", "email address"]
-        email_headers.each do |e|
-          @email_header = e if first_row.include?(e)
+        email_headers.each do |header|
+          @email_header = header if first_row.include?(header)
         end
         raise EmailColumnError unless @email_header
-      rescue FileTypeError, FileEmptyError, TimestampColumnError, EmailColumnError => e
-        @errors << e
+      rescue FileTypeError, TimestampColumnError, EmailColumnError => e
+        @errors << [1, e]
         throw :halt_import
       end
 
diff --git a/app/views/layouts/adopter_foster_dashboard.html.erb b/app/views/layouts/adopter_foster_dashboard.html.erb
index bb4858c06..e6eaca4b3 100644
--- a/app/views/layouts/adopter_foster_dashboard.html.erb
+++ b/app/views/layouts/adopter_foster_dashboard.html.erb
@@ -121,11 +121,6 @@
                           <i class="fe fe-power nav-icon"></i> Log Out
                         <% end %>
                       </li>
-                      <li class="nav-item">
-                        <%= active_link_to adopter_fosterer_dashboard_index_path, class: "nav-link" do %>
-                          <i class="fe fe-trash nav-icon"></i> Delete Account
-                        <% end %>
-                      </li>
                     </ul>
                   </div>
                 </div>
diff --git a/app/views/layouts/shared/_navbar.html.erb b/app/views/layouts/shared/_navbar.html.erb
index 3352787e7..8c4be241c 100644
--- a/app/views/layouts/shared/_navbar.html.erb
+++ b/app/views/layouts/shared/_navbar.html.erb
@@ -1,15 +1,5 @@
 <nav class="navbar navbar-expand-lg bg-transparent shadow-none px-0 py-3">
   <div class="container-fluid px-4">
-    <div class="d-flex gap-2">
-      <% if Current.organization.avatar.attached? %>
-        <%= image_tag Current.organization.avatar, alt: current_organization_name, title: current_organization_name, height: 30 %>
-      <% end %>
-
-      <%= link_to home_index_path, class: 'navbar-brand fw-bold text-black' do %>
-        <%= Current.organization.name %>
-      <% end %>
-    </div>
-
     <div class="d-flex align-items-center order-lg-3">
       <div>
         <button class="navbar-toggler collapsed me-1" type="button" data-bs-toggle="collapse" data-bs-target="#navbar-default3" aria-controls="navbar-default3" aria-expanded="false" aria-label="Toggle navigation">
@@ -30,6 +20,16 @@
       <% end %>
     </div>
 
+    <div class="d-flex gap-2">
+      <% if Current.organization.avatar.attached? %>
+        <%= image_tag Current.organization.avatar, alt: current_organization_name, title: current_organization_name, height: 30 %>
+      <% end %>
+
+      <%= link_to home_index_path, class: 'navbar-brand fw-bold text-black d-none d-sm-block' do %>
+        <%= Current.organization.name %>
+      <% end %>
+    </div>
+
     <!-- Collapse -->
     <div class="justify-content-end collapse navbar-collapse" id="navbar-default3">
       <ul class="navbar-nav">
diff --git a/app/views/organizations/adoptable_pets/index.html.erb b/app/views/organizations/adoptable_pets/index.html.erb
index e2fc693ad..563459244 100644
--- a/app/views/organizations/adoptable_pets/index.html.erb
+++ b/app/views/organizations/adoptable_pets/index.html.erb
@@ -26,7 +26,7 @@
               </div>
               <div class="form-group">
                 <%= f.label :sex_eq, "Sex" %>
-                <%= f.select :sex_eq, ["Male", "Female"], {include_blank: 'All'}, class: "form-select" %>
+                <%= f.select :sex_eq, [["Male", "male"], ["Female", "female"]], {include_blank: 'All'}, class: "form-select" %>
               </div>
               <div class="form-group">
                 <%= f.label :breed_eq, "Breed" %>
diff --git a/app/views/organizations/adoptable_pets/show.html.erb b/app/views/organizations/adoptable_pets/show.html.erb
index be807cd85..7e173f1f4 100644
--- a/app/views/organizations/adoptable_pets/show.html.erb
+++ b/app/views/organizations/adoptable_pets/show.html.erb
@@ -156,6 +156,11 @@
                     <%= image_tag('green_check.png', height: '21') %>
                   <% end %>
                 </div>
+                <% if 'awaiting_data' == @adoption_application.status %>
+                  <div class="mt-1">
+                    <%= render partial: "shared/empty_state", locals: {text: "Please make sure you fill out the adoption questionnaire so staff have enough information to process your application."} %>
+                  </div>
+                <% end %>
               <% elsif allowed_to?(:manage?, @pet) %>
                 <%= link_to "Manage #{@pet.name}", staff_pet_path(@pet) %>
               <%# FIXME: This section was missed during the remove of AdopterFosterProfile but I think it requires FormSubmission to be ready to refactor %>
diff --git a/app/views/organizations/adopter_fosterer/external_form/index.html.erb b/app/views/organizations/adopter_fosterer/external_form/index.html.erb
index e024a54cf..7831e4c0f 100644
--- a/app/views/organizations/adopter_fosterer/external_form/index.html.erb
+++ b/app/views/organizations/adopter_fosterer/external_form/index.html.erb
@@ -1,32 +1,32 @@
-<div class="d-flex flex-column align-items-center mb-4">
-  <div class="my-4 mx-8">
-    <% if params[:dashboard] %>
-
-      <% if current_user.person.latest_form_submission.present? %>
-        <p class="fw-bold mb-0"><%= t('organizations.adopter_fosterer.form_instructions.previous_answers') %> <%= link_to t('general.here'), adopter_fosterer_form_answers_path %>.</p>
-        <p><%= t('organizations.adopter_fosterer.form_instructions.update_form_answers') %></p>
+<section class="container d-flex flex-column py-6">
+  <div class="row justify-content-center gap-6">
+  <div class="col-8">
+      <% if params[:dashboard] %>
+        <% if current_user.person.latest_form_submission.present? %>
+          <p class="fw-bold mb-0"><%= t('organizations.adopter_fosterer.form_instructions.previous_answers') %> <%= link_to t('general.here'), adopter_fosterer_form_answers_path %>.</p>
+          <p><%= t('organizations.adopter_fosterer.form_instructions.update_form_answers') %></p>
+        <% else %>
+          <p><%= t("organizations.adopter_fosterer.form_instructions.dashboard", user_email: current_user.email) %></p>
+        <% end %>
       <% else %>
-        <p><%= t("organizations.adopter_fosterer.form_instructions.dashboard", user_email: current_user.email) %></p>
-      <% end %>
-
-  <% else %>
-      <p><%= t(
-          "organizations.adopter_fosterer.form_instructions.index",
-          organization_name: Current.tenant.name,
-        ) %></p>
+        <div>
+          <p class="fw-bold"><%= t(
+              "organizations.adopter_fosterer.form_instructions.index",
+              organization_name: Current.tenant.name,
+              email: current_user.email
+            ) %></p>
+          <%= link_to "Go to my dashboard", adopter_fosterer_dashboard_index_path, class: "btn btn-primary" %>
+        </div>
     <% end %>
-    <div class="d-flex justify-content-end gap-2 pb-2">
-      <%= link_to " #{t("general.view")} #{t("general.dogs")}",
-      adoptable_pets_path(species: "dog"),
-      class: "btn btn-primary" %>
-      <%= link_to " #{t("general.view")} #{t("general.cats")}",
-      adoptable_pets_path(species: "cat"),
-      class: "btn btn-primary" %>
     </div>
+
+    <div class="row">
+      <iframe id="external-form"
+        src=<%= @form_url%>
+        width="90%"
+        height="645"
+        >Loading…</iframe>
+    </div>
+
   </div>
-  <iframe id="external-form"
-    src=<%= @form_url%>
-    width="90%" 
-    height="645"
-    >Loading…</iframe>
-</div>
+</section>
diff --git a/app/views/organizations/staff/external_form_upload/_upload_in_progress.html.erb b/app/views/organizations/staff/external_form_upload/_upload_in_progress.html.erb
new file mode 100644
index 000000000..5c4f18ba9
--- /dev/null
+++ b/app/views/organizations/staff/external_form_upload/_upload_in_progress.html.erb
@@ -0,0 +1,5 @@
+<div id="results" class="d-flex justify-content-center">
+  <div class="spinner-border text-primary" role="status">
+    <span class="visually-hidden">Loading...</span>
+  </div>
+</div>
diff --git a/app/views/organizations/staff/external_form_upload/_upload_results.html.erb b/app/views/organizations/staff/external_form_upload/_upload_results.html.erb
index 3fec92405..7006b64a5 100644
--- a/app/views/organizations/staff/external_form_upload/_upload_results.html.erb
+++ b/app/views/organizations/staff/external_form_upload/_upload_results.html.erb
@@ -1,21 +1,21 @@
-<turbo-frame id="results">
-    <% if import.success? %>
-        <div class="alert alert-success">
-            <h5 class="alert-heading" role="alert"><%= t('.success_heading') %></h5>
-            <p><%= t('.submissions_added', count: import.count) %></p>
-        </div>
-    <% else %>
-        <div class="alert alert-danger">
-            <h5 class="alert-heading" role="alert"><%= t('.error_heading', count: import.errors.count) %></h5>
-            <p><%= t('.submissions_added', count: import.count) %></p>
-            <%= t('.review_errors', count: import.count) %>
-            <ul>
-                <% import.errors.each do |error| %>
-                    <li>
-                        <%= t('.row', number: error[0], message: error[1].message) %>
-                    </li>
-                <% end %>
-            </ul>
-         </div>
-    <% end %>
-</turbo-frame>
+<%= tag.div id: "results" do %>
+  <% if import.success? %>
+    <div class="alert alert-success">
+      <h5 class="alert-heading" role="alert"><%= t(".success_heading") %></h5>
+      <p><%= t(".submissions_added", count: import.count) %></p>
+    </div>
+  <% else %>
+    <div class="alert alert-danger">
+      <h5 class="alert-heading" role="alert"><%= t(".error_heading", count: import.errors.count) %></h5>
+      <p><%= t(".submissions_added", count: import.count) %></p>
+      <%= t(".review_errors", count: import.count) %>
+      <ul>
+        <% import.errors.each do |error| %>
+          <li>
+            <%= t(".row", number: error[0], message: error[1].message) %>
+          </li>
+        <% end %>
+      </ul>
+    </div>
+  <% end %>
+<% end %>
diff --git a/app/views/organizations/staff/external_form_upload/create.turbo_stream.erb b/app/views/organizations/staff/external_form_upload/create.turbo_stream.erb
new file mode 100644
index 000000000..9209f912c
--- /dev/null
+++ b/app/views/organizations/staff/external_form_upload/create.turbo_stream.erb
@@ -0,0 +1,3 @@
+<%= turbo_stream.replace("flash", partial: "layouts/shared/flash_messages") %>
+
+<%= turbo_stream.replace("results", partial: "upload_in_progress") %>
diff --git a/app/views/organizations/staff/external_form_upload/index.html.erb b/app/views/organizations/staff/external_form_upload/index.html.erb
index e47e6264d..c466bb418 100644
--- a/app/views/organizations/staff/external_form_upload/index.html.erb
+++ b/app/views/organizations/staff/external_form_upload/index.html.erb
@@ -1,14 +1,21 @@
 <%= render DashboardPageComponent.new(crumb: :external_form) do |c| %>
-  <% c.with_header_title { t('.header') } %>
+  <% c.with_header_title { t(".header") } %>
   <% c.with_body do %>
     <section>
       <div>
         <div>
-          <p><%= t('.description') %></p>
-          <p class="fw-bold"><%= t('.csv_header_requirements') %></p>
-          <%= render "organizations/staff/shared/attachment_form", instance: nil, title: 'Files', url: staff_external_form_upload_index_path, multiple: false, attachment_type: 'files' %>
+          <p><%= t(".description") %></p>
+          <p class="fw-bold"><%= t(".csv_header_requirements") %></p>
+          <%= render "organizations/staff/shared/attachment_form",
+          instance: nil,
+          title: "Files",
+          url: staff_external_form_upload_index_path,
+          multiple: false,
+          attachment_type: "files" %>
         </div>
       </div>
     </section>
+    <%= turbo_stream_from ["csv_import", current_user] %>
+    <%= tag.div id: "results" %>
   <% end %>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/organizations/staff/pets/index.html.erb b/app/views/organizations/staff/pets/index.html.erb
index 1c512133b..98df3b5f9 100644
--- a/app/views/organizations/staff/pets/index.html.erb
+++ b/app/views/organizations/staff/pets/index.html.erb
@@ -18,7 +18,7 @@
                   </div>
                   <div class="form-group mb-3 col-md-3">
                     <%= f.label :sex_eq, "Sex" %>
-                    <%= f.select :sex_eq, ["Male", "Female"], {include_blank: 'All'}, class: "form-select" %>
+                    <%= f.select :sex_eq, [["Male", "male"], ["Female", "female"]], {include_blank: 'All'}, class: "form-select" %>
                   </div>
                   <div class="form-group mb-3 col-md-3">
                     <%= f.label :species_eq, "Species" %>
diff --git a/app/views/organizations/staff/shared/_attachment_form.html.erb b/app/views/organizations/staff/shared/_attachment_form.html.erb
index afc990301..58a741680 100644
--- a/app/views/organizations/staff/shared/_attachment_form.html.erb
+++ b/app/views/organizations/staff/shared/_attachment_form.html.erb
@@ -16,12 +16,12 @@
                           direct_upload: true,
                           class: "custom-attachments",
                           hide_label: true %>
-          <small class="form-text text-muted"> 
+          <small class="form-text text-muted">
             <% if attachment_type == 'files' %>
               Files must be .pdf, .png, or .jpeg under 2MB.
             <% elsif attachment_type == 'images' %>
-              Images must be .jpg or .png under 1MB. 
-            <%end%>
+              Images must be .jpg or .png under 1MB.
+            <% end %>
           </small>
         </div>
         <div class="ps-2">
@@ -29,6 +29,5 @@
         </div>
       </div>
     <% end %>
-    <%= turbo_frame_tag "results" %>
   </div>
 </div>
diff --git a/app/views/shared/_location_fields.html.erb b/app/views/shared/_location_fields.html.erb
index 89da415c0..cbcc4140e 100644
--- a/app/views/shared/_location_fields.html.erb
+++ b/app/views/shared/_location_fields.html.erb
@@ -1,4 +1,5 @@
 <!-- Country Select -->
+<div class="form-group w-100">
 <%= form.select :country,
                 COUNTRIES_STATES.keys.index_with { |abbr| COUNTRIES_STATES.dig(abbr, :name) }.invert,
                 { prompt: "Please select" },
@@ -9,7 +10,10 @@
                   required: true,
                   class: 'form-control'
                 }  %>
+</div>
+
 <!-- Province/State Select -->
+<div class="form-group w-100">
 <%= form.select :province_state,
                 form.object.country.present? ? 
                 COUNTRIES_STATES.dig(form.object.country.to_sym, :states)&.map { |abbr, name| [:name, abbr] } : [],
@@ -19,7 +23,11 @@
                   required: true,
                   class: 'form-control'
                 }  %>
+</div>
+
 <!-- City/Town Text Field -->
+<div class="form-group w-100">
 <%= form.text_field :city_town,
-                    required: false,
+                    required: true,
                     class: "form-control" %>
+</div>
\ No newline at end of file
diff --git a/config/locales/en.yml b/config/locales/en.yml
index ff3bf8938..d1a81170a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -677,6 +677,8 @@ en:
           description: "If you collect information from adopters from a third party service, like Google Forms, you can export a CSV file from Google Forms and upload it here. We will import the questions and answers for any adopters who have an account on your Homeward Tails website, providing they use the same email address. Then you will be able to see the information for each adopter when reviewing applications."
           header: "Upload CSV File"
           csv_header_requirements: "Your CSV file must have column headers of 'Email' and 'Timestamp' for the import to work."
+        create:
+          processing_file: "File uploaded for processing"
         upload_results:
           success_heading: "File successfully scanned"
           error_heading: "File scanned: %{count} error(s) present"
@@ -733,7 +735,7 @@ en:
           header: "Welcome to %{organization_name}!"
           body_text: "At %{organization_name}, we’re dedicated to rescuing, rehabilitating, and rehoming animals in need. Your support helps us provide care, love, and hope to these pets until they find their forever homes."
       form_instructions:
-        index: "Please complete this form using the same email address you signed up with. %{organization_name} needs this information in order to process your application(s)."
+        index: "Please complete this form using the same email address you signed up with (%{email}). %{organization_name} needs this information in order to process your application(s). If you do not complete this form now, you can do so later via the 'Form' link in your dashboard"
         previous_answers: "You have already completed this form. View your responses"
         update_form_answers: "Please only submit this form again if your details have changed and need updating."
         dashboard: "Please complete this form so we have sufficient information to begin processing your adoption applications. Please ensure to use the same email address in the form as you did to register on this website (%{user_email})."
diff --git a/config/routes.rb b/config/routes.rb
index be3fa6e53..0807716bc 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -67,10 +67,6 @@
         resources :form_submissions, only: [:index]
       end
 
-      resources :people do
-        resources :form_submissions, only: [:index]
-      end
-
       resources :form_submissions do
         resources :form_answers, only: [:index]
       end
diff --git a/test/controllers/organizations/staff/external_form_upload_controller_test.rb b/test/controllers/organizations/staff/external_form_upload_controller_test.rb
index e6d10c676..94beeed7c 100644
--- a/test/controllers/organizations/staff/external_form_upload_controller_test.rb
+++ b/test/controllers/organizations/staff/external_form_upload_controller_test.rb
@@ -3,55 +3,25 @@
 module Organizations
   module Staff
     class ExternalFormUploadControllerTest < ActionDispatch::IntegrationTest
-      context "success" do
-        setup do
-          file = fixture_file_upload("google_form_sample.csv", "text/csv")
-          @params = {files: file}
-          admin = create(:admin)
-          @adopter = create(:adopter, email: "adopter1111@alta.com")
-          @adopter2 = create(:adopter, email: "no_answer_will_be_created@alta.com")
-          sign_in admin
-        end
-
-        should "Creates new form submission" do
-          assert_difference "@adopter.person.form_submissions.count" do
-            post staff_external_form_upload_index_path, params: @params
-          end
-        end
-
-        should "It does not create form answers for adopter2" do
-          assert_no_difference "@adopter2.person.form_submissions.count" do
-            post staff_external_form_upload_index_path, params: @params
-          end
-        end
-
-        should "shows success feedback" do
-          post staff_external_form_upload_index_path, params: @params, as: :turbo_stream
-
-          assert_response :success
-          assert_turbo_stream(action: "replace", count: 1) do
-            assert_select "h5", text: "File successfully scanned"
-          end
-        end
+      setup do
+        file = fixture_file_upload("google_form_sample.csv", "text/csv")
+        @params = {files: file}
+        admin = create(:admin)
+        sign_in admin
       end
 
-      context "error" do
-        setup do
-          file = fixture_file_upload("google_form_error_sample.csv", "text/csv")
-          @params = {files: file}
-          admin = create(:admin)
-          create(:adopter, email: "adopter1234@alta.com")
-          sign_in admin
-        end
+      should "get index" do
+        get staff_external_form_upload_index_path
+        assert_response :success
+      end
 
-        should "shows error feedback" do
+      should "Creates new form submission" do
+        assert_enqueued_with(job: CsvImportJob) do
           post staff_external_form_upload_index_path, params: @params, as: :turbo_stream
-
-          assert_response :success
-          assert_turbo_stream(action: "replace", count: 1) do
-            assert_select "h5", text: "File scanned: 1 error(s) present"
-          end
         end
+
+        assert_response :success
+        assert_equal "File uploaded for processing", flash[:notice]
       end
     end
   end
diff --git a/test/services/organizations/csv_import_service_test.rb b/test/services/organizations/csv_import_service_test.rb
index a27943216..cc388e41c 100644
--- a/test/services/organizations/csv_import_service_test.rb
+++ b/test/services/organizations/csv_import_service_test.rb
@@ -4,26 +4,23 @@
 module Organizations
   class CsvImportServiceTest < ActiveSupport::TestCase
     setup do
-      adopter = create(:adopter)
-      Current.organization = adopter.organization
+      @adopter = create(:adopter)
+      Current.organization = @adopter.organization
 
       @file = Tempfile.new(["test", ".csv"])
-      @file.stubs(:content_type).returns("text/csv")
 
       headers = ["Timestamp", "First name", "Last name", "Email", "Address", "Phone number", *Faker::Lorem.questions]
 
       @data = [
         "2024-10-02 12:45:37.000000000 +0000",
-        adopter.first_name,
-        adopter.last_name,
-        adopter.email,
+        @adopter.first_name,
+        @adopter.last_name,
+        @adopter.email,
         Faker::Address.full_address,
         Faker::PhoneNumber.phone_number,
         *Faker::Lorem.sentences
       ]
 
-      @adopter = adopter
-
       CSV.open(@file.path, "wb") do |csv|
         csv << headers
       end
@@ -37,10 +34,13 @@ class CsvImportServiceTest < ActiveSupport::TestCase
       CSV.open(@file.path, "ab") do |csv|
         csv << @data
       end
-
+      blob = ActiveStorage::Blob.create_and_upload!(
+        io: @file.open,
+        filename: "file.csv"
+      )
       assert_difference "FormSubmission.count" do
         assert_difference("FormAnswer.count", + 7) do
-          Organizations::Importers::CsvImportService.new(@file).call
+          Organizations::Importers::CsvImportService.new(blob, @adopter.id).call
         end
       end
     end
@@ -51,8 +51,12 @@ class CsvImportServiceTest < ActiveSupport::TestCase
         csv << @data
       end
 
+      blob = ActiveStorage::Blob.create_and_upload!(
+        io: @file.open,
+        filename: "file.csv"
+      )
       assert_no_difference "FormSubmission.count" do
-        Organizations::Importers::CsvImportService.new(@file).call
+        Organizations::Importers::CsvImportService.new(blob, @adopter.id).call
       end
     end
 
@@ -61,71 +65,109 @@ class CsvImportServiceTest < ActiveSupport::TestCase
         csv << @data
         csv << @data
       end
+
+      blob = ActiveStorage::Blob.create_and_upload!(
+        io: @file.open,
+        filename: "file.csv"
+      )
       assert_difference "FormSubmission.count", 1 do
-        Organizations::Importers::CsvImportService.new(@file).call
+        Organizations::Importers::CsvImportService.new(blob, @adopter.id).call
       end
     end
 
-    should "return summary of import when successful" do
+    should "return successful scan broadcast" do
       CSV.open(@file.path, "ab") do |csv|
         csv << @data
       end
-      import = Organizations::Importers::CsvImportService.new(@file).call
-
-      assert import.success?
-      assert_equal 1, import.count
-      assert import.errors.empty?
+      blob = ActiveStorage::Blob.create_and_upload!(
+        io: @file.open,
+        filename: "file.csv"
+      )
+      service = Organizations::Importers::CsvImportService.new(blob, @adopter.id)
+      service.call
+      errors = service.instance_variable_get(:@errors)
+
+      turbo_stream = capture_turbo_stream_broadcasts ["csv_import", @adopter]
+
+      assert_equal "File successfully scanned", turbo_stream.first.at_css(".alert-heading").text.strip
+      assert errors.empty?
     end
 
-    should "return errors" do
+    should "return errors for malformed data" do
       @data[0] = "2024/13/27 10:24:05 AM AST"
       CSV.open(@file.path, "ab") do |csv|
         csv << @data
       end
-      import = Organizations::Importers::CsvImportService.new(@file).call
-
-      refute import.success?
-      assert_equal "mon out of range", import.errors[0][1].message
+      blob = ActiveStorage::Blob.create_and_upload!(
+        io: @file.open,
+        filename: "file.csv"
+      )
+      service = Organizations::Importers::CsvImportService.new(blob, @adopter.id)
+      service.call
+      errors = service.instance_variable_get(:@errors)
+
+      turbo_stream = capture_turbo_stream_broadcasts ["csv_import", @adopter]
+
+      assert_equal "File scanned: 1 error(s) present", turbo_stream.first.at_css(".alert-heading").text.strip
+      assert_equal "mon out of range", errors.first[1].message
     end
 
     should "validate file type" do
-      file = Tempfile.new(["test", ".png"])
-      file.stubs(:content_type).returns("image/png")
-      import = Organizations::Importers::CsvImportService.new(file).call
-
-      assert_equal "Invalid File Type: File type must be CSV", import.errors.first.message
-    end
-
-    should "validate empty file" do
-      file = Tempfile.new(["test", ".csv"])
-      file.stubs(:content_type).returns("text/csv")
-      import = Organizations::Importers::CsvImportService.new(file).call
-
-      assert_equal "File is empty", import.errors.first.message
+      blob = ActiveStorage::Blob.create_and_upload!(
+        io: File.open(Rails.root.join("test/fixtures/files/logo.png")),
+        filename: "file.png",
+        content_type: "image/png"
+      )
+      service = Organizations::Importers::CsvImportService.new(blob, @adopter.id)
+      service.call
+      errors = service.instance_variable_get(:@errors)
+
+      assert_turbo_stream_broadcasts ["csv_import", @adopter]
+      turbo_stream = capture_turbo_stream_broadcasts ["csv_import", @adopter]
+      assert_equal "File scanned: 1 error(s) present", turbo_stream.first.at_css(".alert-heading").text.strip
+      assert_equal "Invalid File Type: File type must be CSV", errors.first[1].message
     end
 
     should "validate email header" do
       file = Tempfile.new(["test", ".csv"])
-      headers = ["Timestamp", "First name", "Last name", "Address", "Phone number", *Faker::Lorem.questions]
+      headers = ["Timestamp", "First name", "Last name",
+        "Address", "Phone number", *Faker::Lorem.questions]
       CSV.open(file.path, "wb") do |csv|
         csv << headers
       end
-      file.stubs(:content_type).returns("text/csv")
-      import = Organizations::Importers::CsvImportService.new(file).call
-
-      assert_equal 'The column header "Email" was not found in the attached csv', import.errors.first.message
+      blob = ActiveStorage::Blob.create_and_upload!(
+        io: file.open,
+        filename: "file.csv"
+      )
+      service = Organizations::Importers::CsvImportService.new(blob, @adopter.id)
+      service.call
+      errors = service.instance_variable_get(:@errors)
+
+      assert_turbo_stream_broadcasts ["csv_import", @adopter]
+      turbo_stream = capture_turbo_stream_broadcasts ["csv_import", @adopter]
+      assert_equal "File scanned: 1 error(s) present", turbo_stream.first.at_css(".alert-heading").text.strip
+      assert_equal 'The column header "Email" was not found in the attached csv', errors.first[1].message
     end
 
     should "validate Timestamp header" do
       file = Tempfile.new(["test", ".csv"])
-      headers = ["Email", "First name", "Last name", "Address", "Phone number", *Faker::Lorem.questions]
+      headers = ["Email", "First name", "Last name",
+        "Address", "Phone number", *Faker::Lorem.questions]
       CSV.open(file.path, "wb") do |csv|
         csv << headers
       end
-      file.stubs(:content_type).returns("text/csv")
-      import = Organizations::Importers::CsvImportService.new(file).call
-
-      assert_equal 'The column header "Timestamp" was not found in the attached csv', import.errors.first.message
+      blob = ActiveStorage::Blob.create_and_upload!(
+        io: file.open,
+        filename: "file.csv"
+      )
+      service = Organizations::Importers::CsvImportService.new(blob, @adopter.id)
+      service.call
+      errors = service.instance_variable_get(:@errors)
+
+      assert_turbo_stream_broadcasts ["csv_import", @adopter]
+      turbo_stream = capture_turbo_stream_broadcasts ["csv_import", @adopter]
+      assert_equal "File scanned: 1 error(s) present", turbo_stream.first.at_css(".alert-heading").text.strip
+      assert_equal 'The column header "Timestamp" was not found in the attached csv', errors.first[1].message
     end
   end
 end