From 4a05e13b3aecfdb0704f85d33201add150f992ed Mon Sep 17 00:00:00 2001
From: Ryan Wold <ryan.wold@gsa.gov>
Date: Thu, 9 Nov 2023 16:34:08 -0800
Subject: [PATCH 1/7] download .csv rather than render the .csv as text

* download all ServiceProviders, and still be able to filter out inactive HISPs
---
 app/controllers/admin/reporting_controller.rb | 10 +++++-----
 app/models/service_provider.rb                |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/controllers/admin/reporting_controller.rb b/app/controllers/admin/reporting_controller.rb
index a5e86e2f2..c28c350a7 100644
--- a/app/controllers/admin/reporting_controller.rb
+++ b/app/controllers/admin/reporting_controller.rb
@@ -5,7 +5,7 @@ class ReportingController < AdminController
     def index; end
 
     def hisps
-      render plain: ServiceProvider.to_csv
+      send_data ServiceProvider.to_csv, filename: "touchpoints-service-providers-#{Date.today}.csv"
     end
 
     def hisp_services
@@ -35,7 +35,7 @@ def hisp_services
 
       row << header_fields.join(',')
 
-      ServiceProvider.all.includes(:organization).order('organizations.name', :name).each do |service_provider|
+      ServiceProviderall..all.includes(:organization).order('organizations.name', :name).each do |service_provider|
         service_provider.services.order(:name).each do |service|
           service.omb_cx_reporting_collections.includes(:service, :collection).order('collections.year', 'collections.quarter', 'services.name').each do |omb_cx_reporting_collection|
             row_fields = [
@@ -363,18 +363,18 @@ def no_submissions
     def service_surveys
       @services = Service.includes(:organization, :forms).all.order('organizations.name, services.name')
     end
-    
+
     def users
       @users_who_need_accounts = []
       Website.where("site_owner_email IS NOT NULL OR contact_email IS NOT NULL").all.each do |website|
-        
+
         if website.site_owner_email.present?
           user = User.find_by_email(website.site_owner_email)
           if user.nil?
             @users_who_need_accounts << website.site_owner_email
           end
         end
-        
+
         if website.contact_email.present?
           user2 = User.find_by_email(website.contact_email)
           if user2.nil?
diff --git a/app/models/service_provider.rb b/app/models/service_provider.rb
index d573c6f14..63702c395 100644
--- a/app/models/service_provider.rb
+++ b/app/models/service_provider.rb
@@ -42,7 +42,7 @@ def self.to_csv
         portfolio_manager_email
       ]
 
-      ServiceProvider.active
+      ServiceProvider
         .includes(:organization)
         .order('organizations.name', :name).each do |provider|
         csv << [

From 9a23071eed2ae3f40de6c2f942b412355aa87374 Mon Sep 17 00:00:00 2001
From: kewitham <katiewitham@navapbc.com>
Date: Tue, 14 Nov 2023 11:18:57 -0600
Subject: [PATCH 2/7] add aria label to feedback modal dialog

---
 app/views/components/widget/_modal.html.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/components/widget/_modal.html.erb b/app/views/components/widget/_modal.html.erb
index d4b0a78bc..658785680 100644
--- a/app/views/components/widget/_modal.html.erb
+++ b/app/views/components/widget/_modal.html.erb
@@ -1,6 +1,7 @@
 <div id="fba-modal-dialog"
   class="fba-modal-dialog"
   role="dialog"
+  aria-label="Feedback modal dialog"
   aria-modal="<%= ['modal', 'custom-button-modal'].include?(form.delivery_method) ? 'true' : 'false' %>">
   <%= render "components/widget/no_modal", form: form do %>
     <%= render partial: 'components/forms/footer', locals: { form: form } %>

From 4b1d4127af24b4002f942d0d9cd6a61bfd67369b Mon Sep 17 00:00:00 2001
From: Ryan Wold <64987852+ryanwoldatwork@users.noreply.github.com>
Date: Fri, 17 Nov 2023 15:20:59 -0800
Subject: [PATCH 3/7] cx collection uploads

* add cx_collection_detail_upload
* update gems
* allow .org only for websites
* remove redundant Service Provider and Service fields
* don't run bullet in test, only in develop
* question text is a bit more clear
* space between data-url
* don't nest elements in small tag
* short description first
---
 Gemfile                                       |   1 +
 Gemfile.lock                                  | 129 ++++++++++--------
 app/assets/stylesheets/site.scss              |   2 +-
 .../admin/cx_collection_details_controller.rb |  33 ++++-
 .../admin/service_providers_controller.rb     |   3 -
 app/models/cx_collection_detail_upload.rb     |   4 +
 app/models/website.rb                         |   2 +-
 app/serializers/service_serializer.rb         |   2 -
 .../cx_collection_details/_form.html.erb      |  69 ++++++++--
 .../admin/cx_collection_details/edit.html.erb |  18 +--
 .../admin/cx_collection_details/show.html.erb |  15 +-
 .../cx_collection_details/upload.html.erb     |  60 +++++++-
 app/views/admin/cx_collections/_form.html.erb |  21 ++-
 app/views/admin/cx_collections/show.html.erb  |  47 ++++---
 app/views/admin/forms/delivery.html.erb       |   2 +-
 app/views/admin/forms/index.html.erb          |   2 +-
 app/views/admin/questions/_form.html.erb      |   2 +-
 .../admin/service_providers/_form.html.erb    |  35 +----
 .../_service_provider_managers.html.erb       |  38 +++---
 .../admin/service_providers/index.html.erb    |   2 +-
 .../admin/service_providers/show.html.erb     |  38 ++----
 app/views/admin/service_stages/index.html.erb |   2 +-
 app/views/admin/services/_form.html.erb       |  10 --
 app/views/admin/services/show.html.erb        |  39 ++----
 .../_collection_status_tag.html.erb           |   2 +-
 .../components/forms/edit/_builder.html.erb   |  20 ++-
 .../question_types/_icon_checkboxes.html.erb  |  12 +-
 app/views/components/widget/_widget.css.erb   |   4 +
 config/environments/test.rb                   |   6 -
 config/initializers/touchpoints.rb            |   3 +-
 config/routes.rb                              |   1 +
 ...538_create_cx_collection_detail_uploads.rb |  12 ++
 db/schema.rb                                  |  11 +-
 db/seeds.rb                                   |   9 --
 spec/features/admin/forms_spec.rb             |   4 +-
 spec/features/admin/service_providers_spec.rb |   2 +-
 .../cx_collection_detail_upload_spec.rb       |   5 +
 37 files changed, 393 insertions(+), 274 deletions(-)
 create mode 100644 app/models/cx_collection_detail_upload.rb
 create mode 100644 db/migrate/20231114205538_create_cx_collection_detail_uploads.rb
 create mode 100644 spec/models/cx_collection_detail_upload_spec.rb

diff --git a/Gemfile b/Gemfile
index 9293ef0c2..1d23cfed2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -49,6 +49,7 @@ gem "rubocop-rspec"
 gem 'active_model_serializers', '>= 0.10.13'
 gem 'acts-as-list'
 gem 'aws-sdk-rails', '>= 3.8.0'
+gem 'aws-sdk-s3'
 gem 'caracal', '>= 1.4.1'
 gem 'carrierwave', '>= 2.2.1'
 gem 'devise', '>= 4.8.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index 8fbe99005..a0f39eaad 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -18,50 +18,51 @@ GEM
     aasm-diagram (0.1.3)
       aasm (~> 5.0, >= 4.12)
       ruby-graphviz (~> 1.2)
-    actioncable (7.1.1)
-      actionpack (= 7.1.1)
-      activesupport (= 7.1.1)
+    actioncable (7.1.2)
+      actionpack (= 7.1.2)
+      activesupport (= 7.1.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.1.1)
-      actionpack (= 7.1.1)
-      activejob (= 7.1.1)
-      activerecord (= 7.1.1)
-      activestorage (= 7.1.1)
-      activesupport (= 7.1.1)
+    actionmailbox (7.1.2)
+      actionpack (= 7.1.2)
+      activejob (= 7.1.2)
+      activerecord (= 7.1.2)
+      activestorage (= 7.1.2)
+      activesupport (= 7.1.2)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.1.1)
-      actionpack (= 7.1.1)
-      actionview (= 7.1.1)
-      activejob (= 7.1.1)
-      activesupport (= 7.1.1)
+    actionmailer (7.1.2)
+      actionpack (= 7.1.2)
+      actionview (= 7.1.2)
+      activejob (= 7.1.2)
+      activesupport (= 7.1.2)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.2)
-    actionpack (7.1.1)
-      actionview (= 7.1.1)
-      activesupport (= 7.1.1)
+    actionpack (7.1.2)
+      actionview (= 7.1.2)
+      activesupport (= 7.1.2)
       nokogiri (>= 1.8.5)
+      racc
       rack (>= 2.2.4)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actiontext (7.1.1)
-      actionpack (= 7.1.1)
-      activerecord (= 7.1.1)
-      activestorage (= 7.1.1)
-      activesupport (= 7.1.1)
+    actiontext (7.1.2)
+      actionpack (= 7.1.2)
+      activerecord (= 7.1.2)
+      activestorage (= 7.1.2)
+      activesupport (= 7.1.2)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.1.1)
-      activesupport (= 7.1.1)
+    actionview (7.1.2)
+      activesupport (= 7.1.2)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
@@ -71,22 +72,22 @@ GEM
       activemodel (>= 4.1)
       case_transform (>= 0.2)
       jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
-    activejob (7.1.1)
-      activesupport (= 7.1.1)
+    activejob (7.1.2)
+      activesupport (= 7.1.2)
       globalid (>= 0.3.6)
-    activemodel (7.1.1)
-      activesupport (= 7.1.1)
-    activerecord (7.1.1)
-      activemodel (= 7.1.1)
-      activesupport (= 7.1.1)
+    activemodel (7.1.2)
+      activesupport (= 7.1.2)
+    activerecord (7.1.2)
+      activemodel (= 7.1.2)
+      activesupport (= 7.1.2)
       timeout (>= 0.4.0)
-    activestorage (7.1.1)
-      actionpack (= 7.1.1)
-      activejob (= 7.1.1)
-      activerecord (= 7.1.1)
-      activesupport (= 7.1.1)
+    activestorage (7.1.2)
+      actionpack (= 7.1.2)
+      activejob (= 7.1.2)
+      activerecord (= 7.1.2)
+      activesupport (= 7.1.2)
       marcel (~> 1.0)
-    activesupport (7.1.1)
+    activesupport (7.1.2)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -104,7 +105,7 @@ GEM
     aes_key_wrap (1.1.0)
     ast (2.4.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.848.0)
+    aws-partitions (1.849.0)
     aws-record (2.13.0)
       aws-sdk-dynamodb (~> 1, >= 1.85.0)
     aws-sdk-core (3.186.0)
@@ -115,6 +116,9 @@ GEM
     aws-sdk-dynamodb (1.96.0)
       aws-sdk-core (~> 3, >= 3.184.0)
       aws-sigv4 (~> 1.1)
+    aws-sdk-kms (1.72.0)
+      aws-sdk-core (~> 3, >= 3.184.0)
+      aws-sigv4 (~> 1.1)
     aws-sdk-rails (3.9.0)
       aws-record (~> 2)
       aws-sdk-ses (~> 1, >= 1.50.0)
@@ -123,13 +127,17 @@ GEM
       aws-sessionstore-dynamodb (~> 2)
       concurrent-ruby (~> 1)
       railties (>= 5.2.0)
+    aws-sdk-s3 (1.136.0)
+      aws-sdk-core (~> 3, >= 3.181.0)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.6)
     aws-sdk-ses (1.56.0)
       aws-sdk-core (~> 3, >= 3.184.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-sesv2 (1.41.0)
       aws-sdk-core (~> 3, >= 3.184.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-sqs (1.65.0)
+    aws-sdk-sqs (1.67.0)
       aws-sdk-core (~> 3, >= 3.184.0)
       aws-sigv4 (~> 1.1)
     aws-sessionstore-dynamodb (2.1.0)
@@ -241,7 +249,7 @@ GEM
       activesupport (>= 6.0.0)
       railties (>= 6.0.0)
     io-console (0.6.0)
-    irb (1.8.3)
+    irb (1.9.0)
       rdoc
       reline (>= 0.3.8)
     jbuilder (2.11.5)
@@ -279,7 +287,7 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     logstop (0.3.1)
-    loofah (2.21.4)
+    loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -302,7 +310,7 @@ GEM
     multi_xml (0.6.0)
     multipart-post (2.3.0)
     mutex_m (0.2.0)
-    net-imap (0.4.4)
+    net-imap (0.4.5)
       date
       net-protocol
     net-pop (0.1.2)
@@ -356,7 +364,7 @@ GEM
     public_suffix (5.0.3)
     puma (6.4.0)
       nio4r (~> 2.0)
-    racc (1.7.2)
+    racc (1.7.3)
     rack (2.2.8)
     rack-cors (2.0.1)
       rack (>= 2.0.0)
@@ -369,20 +377,20 @@ GEM
     rackup (1.0.0)
       rack (< 3)
       webrick
-    rails (7.1.1)
-      actioncable (= 7.1.1)
-      actionmailbox (= 7.1.1)
-      actionmailer (= 7.1.1)
-      actionpack (= 7.1.1)
-      actiontext (= 7.1.1)
-      actionview (= 7.1.1)
-      activejob (= 7.1.1)
-      activemodel (= 7.1.1)
-      activerecord (= 7.1.1)
-      activestorage (= 7.1.1)
-      activesupport (= 7.1.1)
+    rails (7.1.2)
+      actioncable (= 7.1.2)
+      actionmailbox (= 7.1.2)
+      actionmailer (= 7.1.2)
+      actionpack (= 7.1.2)
+      actiontext (= 7.1.2)
+      actionview (= 7.1.2)
+      activejob (= 7.1.2)
+      activemodel (= 7.1.2)
+      activerecord (= 7.1.2)
+      activestorage (= 7.1.2)
+      activesupport (= 7.1.2)
       bundler (>= 1.15.0)
-      railties (= 7.1.1)
+      railties (= 7.1.2)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -399,9 +407,9 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    railties (7.1.1)
-      actionpack (= 7.1.1)
-      activesupport (= 7.1.1)
+    railties (7.1.2)
+      actionpack (= 7.1.2)
+      activesupport (= 7.1.2)
       irb
       rackup (>= 1.0.0)
       rake (>= 12.2)
@@ -421,7 +429,7 @@ GEM
     redis-namespace (1.11.0)
       redis (>= 4)
     regexp_parser (2.8.2)
-    reline (0.3.9)
+    reline (0.4.0)
       io-console (~> 0.5)
     request_store (1.5.1)
       rack (>= 1.4)
@@ -566,6 +574,7 @@ DEPENDENCIES
   acts-as-list
   acts-as-taggable-on
   aws-sdk-rails (>= 3.8.0)
+  aws-sdk-s3
   bootsnap
   brakeman
   bullet
diff --git a/app/assets/stylesheets/site.scss b/app/assets/stylesheets/site.scss
index 6323afc6e..361d59a9e 100644
--- a/app/assets/stylesheets/site.scss
+++ b/app/assets/stylesheets/site.scss
@@ -147,7 +147,7 @@ footer {
 .well {
   border: 1px solid #d6d7d9;
   padding: 20px;
-  margin: 10px 0;
+  margin-bottom: 10px;
   overflow-wrap: break-word;
 }
 
diff --git a/app/controllers/admin/cx_collection_details_controller.rb b/app/controllers/admin/cx_collection_details_controller.rb
index 6756b3a37..7b5b48437 100644
--- a/app/controllers/admin/cx_collection_details_controller.rb
+++ b/app/controllers/admin/cx_collection_details_controller.rb
@@ -1,5 +1,5 @@
 class Admin::CxCollectionDetailsController < AdminController
-  before_action :set_cx_collection_detail, only: %i[ show edit upload update destroy ]
+  before_action :set_cx_collection_detail, only: %i[ show edit upload upload_csv update destroy ]
   before_action :set_cx_collections, only: %i[ new edit upload ]
 
   def index
@@ -26,8 +26,8 @@ def create
 
     respond_to do |format|
       if @cx_collection_detail.save
-        format.html { redirect_to admin_cx_collection_detail_url(@cx_collection_detail), notice: "Cx collection detail was successfully created." }
-        format.json { render :show, status: :created, location: @cx_collection_detail }
+        format.html { redirect_to upload_admin_cx_collection_detail_url(@cx_collection_detail), notice: "CX Collection Detail was successfully created." }
+        format.json { render :upload, status: :created, location: @cx_collection_detail }
       else
         format.html { render :new, status: :unprocessable_entity }
         format.json { render json: @cx_collection_detail.errors, status: :unprocessable_entity }
@@ -38,7 +38,7 @@ def create
   def update
     respond_to do |format|
       if @cx_collection_detail.update(cx_collection_detail_params)
-        format.html { redirect_to admin_cx_collection_detail_url(@cx_collection_detail), notice: "Cx collection detail was successfully updated." }
+        format.html { redirect_to admin_cx_collection_detail_url(@cx_collection_detail), notice: "CX Collection Detail was successfully updated." }
         format.json { render :show, status: :ok, location: @cx_collection_detail }
       else
         format.html { render :edit, status: :unprocessable_entity }
@@ -51,11 +51,32 @@ def destroy
     @cx_collection_detail.destroy
 
     respond_to do |format|
-      format.html { redirect_to cx_collection_details_url, notice: "Cx collection detail was successfully destroyed." }
+      format.html { redirect_to cx_collection_details_url, notice: "CX Collection Detail was successfully destroyed." }
       format.json { head :no_content }
     end
   end
 
+  # Handle a large-ish csv upload (5+ MB) to S3
+  def upload_csv
+    file = params[:file] # Assuming the file comes from a form field named 'file'
+    bucket = ENV.fetch("S3_UPLOADS_AWS_BUCKET_NAME")
+
+    s3 = Aws::S3::Resource.new
+    key = "cx_data_collections/cx-upload-#{Time.now.to_i}-#{file.original_filename}}"
+    obj = s3.bucket(bucket).object(file.original_filename)
+    # Upload the file
+    response = obj.upload_file(file.path)
+
+    CxCollectionDetailUpload.create!({
+      user_id: current_user.id,
+      cx_collection_detail_id: @cx_collection_detail.id,
+      size: obj.size,
+      key: obj.key,
+    })
+
+    render :upload, message: 'File successfully uploaded'
+  end
+
   private
     def set_cx_collection_detail
       @cx_collection_detail = CxCollectionDetail.find(params[:id])
@@ -63,7 +84,7 @@ def set_cx_collection_detail
 
     def set_cx_collections
       if service_manager_permissions?
-        @cx_collections = CxCollection.all.includes(:organization)
+        @cx_collections = CxCollection.all.includes(:organization).order('organizations.abbreviation')
       else
         @cx_collections = current_user.organization.cx_collections
       end
diff --git a/app/controllers/admin/service_providers_controller.rb b/app/controllers/admin/service_providers_controller.rb
index 6bac9ae62..d470b9533 100644
--- a/app/controllers/admin/service_providers_controller.rb
+++ b/app/controllers/admin/service_providers_controller.rb
@@ -111,9 +111,6 @@ def service_provider_params
         :description,
         :notes,
         :slug,
-        :department,
-        :department_abbreviation,
-        :bureau,
         :inactive,
         :new,
         :tag_list,
diff --git a/app/models/cx_collection_detail_upload.rb b/app/models/cx_collection_detail_upload.rb
new file mode 100644
index 000000000..88a11c4aa
--- /dev/null
+++ b/app/models/cx_collection_detail_upload.rb
@@ -0,0 +1,4 @@
+class CxCollectionDetailUpload < ApplicationRecord
+    belongs_to :user
+    belongs_to :cx_collection_detail
+end
diff --git a/app/models/website.rb b/app/models/website.rb
index 4e7c75db7..c2ba61b60 100644
--- a/app/models/website.rb
+++ b/app/models/website.rb
@@ -191,7 +191,7 @@ def validate_domain_format
   end
 
   def validate_domain_suffix
-    errors.add(:domain, 'domain must have a valid suffix, like .gov or .mil') unless domain.present? && APPROVED_DOMAINS.any? { |word| domain.end_with?(word) }
+    errors.add(:domain, 'domain must have a valid suffix, like .gov or .mil') unless domain.present? && APPROVED_WEBSITE_DOMAINS.any? { |word| domain.end_with?(word) }
   end
 
   def site_scanner_json_request
diff --git a/app/serializers/service_serializer.rb b/app/serializers/service_serializer.rb
index 8de965232..728944a78 100644
--- a/app/serializers/service_serializer.rb
+++ b/app/serializers/service_serializer.rb
@@ -19,8 +19,6 @@ class ServiceSerializer < ActiveModel::Serializer
              :transactional,
              :notes,
              :hisp,
-             :department,
-             :bureau,
              :service_abbreviation,
              :service_slug,
              :service_owner_email,
diff --git a/app/views/admin/cx_collection_details/_form.html.erb b/app/views/admin/cx_collection_details/_form.html.erb
index 65ae955cb..a2ec1aaea 100644
--- a/app/views/admin/cx_collection_details/_form.html.erb
+++ b/app/views/admin/cx_collection_details/_form.html.erb
@@ -1,4 +1,4 @@
-<%= form_with(model: cx_collection_detail, url: (cx_collection_detail.persisted? ? admin_cx_collection_detail_path(cx_collection_detail) : admin_cx_collection_details_path) ) do |form| %>
+<%= form_with(model: cx_collection_detail, url: (cx_collection_detail.persisted? ? admin_cx_collection_detail_path(cx_collection_detail) : admin_cx_collection_details_path), class: "usa-form") do |form| %>
   <% if cx_collection_detail.errors.any? %>
     <div style="color: red">
       <h2><%= pluralize(cx_collection_detail.errors.count, "error") %> prohibited this cx_collection_detail from being saved:</h2>
@@ -15,26 +15,36 @@
     <%= form.label :cx_collection_id, class: "usa-label" %>
     <%= form.hidden_field :cx_collection_id, class: "usa-input", value: cx_collection_detail.cx_collection_id %>
     <%= form.select :cx_collection_id,
-      cx_collections.map { |collection| ["#{collection.name} - #{collection.organization.name}", collection.id]},
+      cx_collections.map { |collection| ["#{collection.organization.abbreviation} - #{collection.organization.name} - #{collection.service.name}", collection.id]},
       { include_blank: true },
       class: "usa-select" %>
   </div>
 
   <div>
-    <%= form.label :transaction_point, class: "usa-label" %>
+    <%= form.label :transaction_point, "Type of Feedback Survey", class: "usa-label" %>
+    <div class="usa-hint font-sans-2xs">
+      OMB Circular A-11 Section 280 lists three types of customer feedback survey: post-interaction, post-service journey (at the end of a service journey), and relational. Select the best description for your survey.
+    </div>
     <%= form.select :transaction_point,
-      [:post_interaction, :post_service_journey, :relational],
+        [
+          ["Post-interaction", :post_interaction],
+          ["Post-service journey", :post_service_journey],
+          ["Relational", :relational]
+        ],
       { include_blank: true },
       class: "usa-select" %>
   </div>
 
   <div>
-    <%= form.label :channel, class: "usa-label" %>
+    <%= form.label :channel, "Channel of Survey", class: "usa-label" %>
+    <div class="usa-hint font-sans-2xs">
+      Tell us how you deployed the survey. What is the channel you used to reach your respondents?
+    </div>
     <%= form.select :channel, [:computer, :mobile, :paper, :in_person], { prompt: "What type of response channel?" }, class: "usa-select" %>
   </div>
 
   <div class="field">
-    <%= form.label :service_stage_id, class: "usa-label" %>
+    <%= form.label :service_stage_id, "Stage of Service Journey", class: "usa-label" %>
     <% if cx_collection_detail.service %>
     <%= form.select :service_stage_id, options_for_select(cx_collection_detail.cx_collection.service.service_stages.map { |stage| [stage.name, stage.id]}),
       { include_blank: true },
@@ -48,51 +58,82 @@
 
   <div>
     <%= form.label :survey_type, class: "usa-label" %>
-    <%= form.select :survey_type, [["A-11 7 driver questions", :seven_questions], ["A-11 Yes/no thumbs buttons", :yes_no_buttons] ],
+
+    <div class="usa-hint font-sans-2xs">
+      OMB Circular A-11 Section 280 allows for two types of response scale for the required Trust question.
+      Please select the response scale for your survey here.
+    </div>
+
+    <%= form.select :survey_type, [["Thumbs Up/Down", :thumbs_up_down], ["5-point Likert Scale", :likert_scale]],
       { include_blank: true },
       { class: "usa-select" } %>
   </div>
 
   <div>
     <%= form.label :survey_title, class: "usa-label" %>
+    <div class="usa-hint font-sans-2xs">
+      Please provide a short, succinct, public-facing title for your feedback survey.
+    </div>
     <%= form.text_area :survey_title, class: "usa-input" %>
   </div>
 
   <div>
     <%= form.label :omb_control_number, class: "usa-label" %>
+    <div class="usa-hint font-sans-2xs">
+      The OMB Control Number helps us identify the PRA/A-11 Gen IC approval for this survey.
+    </div>
     <%= form.text_field :omb_control_number, class: "usa-input" %>
   </div>
 
   <div>
     <%= form.label :trust_question_text, class: "usa-label" %>
+    <div class="usa-hint font-sans-2xs">
+      Copy and paste the text of the required Trust question in your feedback survey here
+    </div>
     <%= form.text_area :trust_question_text, class: "usa-input" %>
   </div>
 
-  <div>
-    <%= form.label :federal_register_url, class: "usa-label" %>
-    <%= form.text_field :federal_register_url, class: "usa-input" %>
-  </div>
-
   <div>
     <%= form.label :volume_of_customers, class: "usa-label" %>
+    <div class="usa-hint font-sans-2xs">
+      This is your best estimate of the number of customers in your service for this quarter.
+    </div>
     <%= form.number_field :volume_of_customers, class: "usa-input" %>
   </div>
 
   <div>
     <%= form.label :volume_of_customers_provided_survey_opportunity, class: "usa-label" %>
+    <div class="usa-hint font-sans-2xs">
+      This is your best estimate of the number of customers offered the opportunity to complete a feedback survey.
+    </div>
     <%= form.number_field :volume_of_customers_provided_survey_opportunity, class: "usa-input" %>
   </div>
 
   <div>
     <%= form.label :volume_of_respondents, class: "usa-label" %>
+    <div class="usa-hint font-sans-2xs">
+      This is your best estimate of the number of respondents who completed the feedback survey. In general, this should be a count of the number of responses your are responses.
+    </div>
     <%= form.number_field :volume_of_respondents, class: "usa-input" %>
   </div>
 
-  <div>
-    <%= form.label :reflection_text, class: "usa-label" %>
+  <div class="margin-bottom-3">
+    <%= form.label :reflection_text, "Survey reflection", class: "usa-label" %>
+    <div class="usa-hint font-sans-2xs">
+      Tell us what you learned from the survey? (100 words)
+    </div>
     <%= form.text_area :reflection_text, class: "usa-textarea" %>
   </div>
 
+  <div class="usa-alert usa-alert--info font-sans-2xs">
+    <div class="usa-alert__body">
+      <p class="usa-alert__text">
+        Creating this Collection Detail will allow you to submit the corresponding survey data as a CSV file on the next page.
+        You may still edit after you have created the collection detail.
+      </p>
+    </div>
+  </div>
+
   <p>
     <%= form.submit class: "usa-button" %>
   </p>
diff --git a/app/views/admin/cx_collection_details/edit.html.erb b/app/views/admin/cx_collection_details/edit.html.erb
index 256da82e4..a93cd016d 100644
--- a/app/views/admin/cx_collection_details/edit.html.erb
+++ b/app/views/admin/cx_collection_details/edit.html.erb
@@ -3,7 +3,7 @@
 <% end %>
 
 <p>
-  <%= link_to admin_cx_collection_path(@cx_collection_detail.cx_collection) do %>
+  <%= link_to admin_cx_collection_detail_path(@cx_collection_detail) do %>
     <i class="fa fa-arrow-circle-left"></i>
     Back to CX collection detail
   <% end %>
@@ -14,13 +14,13 @@
   cx_collections: @cx_collections %>
 
 <br>
+<br>
 
-<div>
-  <%= link_to "Show this cx collection detail", admin_cx_collection_detail_path(@cx_collection_detail) %> |
-  <%= link_to "Back to cx collection details", admin_cx_collection_details_path %>
-  <br>
-  <br>
-  <%= button_to "Destroy this cx collection detail", admin_cx_collection_detail_path(@cx_collection_detail), method: :delete, class: "usa-button usa-button--secondary" %>
-  <br>
-  <br>
+<div class="usa-row">
+  <div class="grid-col text-right">
+    <%= button_to "Destroy this cx collection detail", admin_cx_collection_detail_path(@cx_collection_detail), method: :delete, class: "usa-button usa-button--secondary" %>
+  </div>
 </div>
+
+<br>
+<br>
\ No newline at end of file
diff --git a/app/views/admin/cx_collection_details/show.html.erb b/app/views/admin/cx_collection_details/show.html.erb
index 8427d06a0..325d125d1 100644
--- a/app/views/admin/cx_collection_details/show.html.erb
+++ b/app/views/admin/cx_collection_details/show.html.erb
@@ -1,9 +1,9 @@
 <% content_for :navigation_title do %>
   <% if true || service_permissions?(service: @service) %>
   <div class="float-right">
-    <%= link_to upload_admin_cx_collection_detail_path(@cx_collection_detail), class: "usa-button usa-button-inverted" do %>
+    <%= link_to upload_admin_cx_collection_detail_path(@cx_collection_detail), class: "usa-button usa-button--primary" do %>
       <i class="fa fa-upload"></i>
-      Upload
+      Upload Responses
     <% end %>
     <%= link_to edit_admin_cx_collection_detail_path(@cx_collection_detail), class: "usa-button usa-button-inverted" do %>
     <i class="fa fa-pencil-alt"></i>
@@ -44,7 +44,7 @@
 
 <p>
   <strong>Channel:</strong>
-  <%= @cx_collection_detail.transaction_point %>
+  <%= @cx_collection_detail.channel %>
 
 </p>
 
@@ -52,6 +52,9 @@
   <strong>Service stage:</strong>
   <% if @cx_collection_detail.service_stage %>
   <%= link_to(@cx_collection_detail.service_stage.name, admin_service_service_stage_path(@cx_collection_detail.service_stage)) || 'Select a Service Stage' %>
+  <% else %>
+    <%= link_to "Service Stage", admin_service_service_stages_path(@cx_collection_detail.service) %>
+    is not defined.
   <% end %>
 </p>
 
@@ -78,12 +81,6 @@
   <%= @cx_collection_detail.omb_control_number %>
 </p>
 
-<p>
-  <strong>Federal register url:</strong>
-  <%= @cx_collection_detail.federal_register_url %>
-
-</p>
-
 <p>
   <strong>Reflection text:</strong>
   <%= @cx_collection_detail.reflection_text %>
diff --git a/app/views/admin/cx_collection_details/upload.html.erb b/app/views/admin/cx_collection_details/upload.html.erb
index 5001ef776..6a107a060 100644
--- a/app/views/admin/cx_collection_details/upload.html.erb
+++ b/app/views/admin/cx_collection_details/upload.html.erb
@@ -11,14 +11,30 @@
   Upload CX Collection Data
 <% end %>
 
-<p>
+<div class="usa-prose">
   <%= link_to admin_cx_collection_detail_path(@cx_collection_detail) do %>
   <i class="fa fa-arrow-circle-left"></i>
   Back to CX Data Collection Detail
   <% end %>
+</div>
+
+<p>
+  Before you attach your survey dataset below.
+  <br>
+  Please review this checklist and make sure the excel meet these formatting requirements:
+  <br>
+  Is it named correctly. Examples -
+  <br>
+  Is it a CSV formatted file?
+  <br>
+  Are the 14 columns?
+  <br>
+  Is each row a response to the feedback survey.
+  Does it generally look like
+  <%= link_to "this", "https://github.com/gsa/touchpoints/wiki/" %>?
 </p>
 
-<%= form_with(model: @cx_collection_detail, url: (@cx_collection_detail.persisted? ? admin_cx_collection_detail_path(@cx_collection_detail) : admin_cx_collection_details_path) ) do |form| %>
+<%= form_with url: post_csv_admin_cx_collection_detail_path, method: :post, local: true, multipart: true do |form| %>
   <% if @cx_collection_detail.errors.any? %>
     <div style="color: red">
       <h2><%= pluralize(@cx_collection_detail.errors.count, "error") %> prohibited this cx_collection_detail from being saved:</h2>
@@ -34,10 +50,48 @@
   <div class="usa-form-group">
     <%= form.label :logo_display, "Upload CX Data Collection", class: "usa-label text-uppercase font-body-3xs",
     for: "file-input-single" %>
-    <%= form.file_field :logo, class: "usa-file-input display-logo", data_url: "" %>
+    <%= form.file_field :file, class: "usa-file-input display-logo", data_url: "" %>
   </div>
 
   <p>
     <%= form.submit class: "usa-button" %>
   </p>
 <% end %>
+
+<% uploads = CxCollectionDetailUpload.where(cx_collection_detail_id: @cx_collection_detail.id) %>
+<table class="usa-table">
+  <thead>
+    <tr>
+      <th>User</th>
+      <th>File path</th>
+      <th>Size</th>
+      <th>Timestamp</th>
+      <th></th>
+    </tr>
+  </thead>
+
+  <tbody>
+    <% uploads.each do |upload| %>
+      <tr>
+        <td>
+          <%= upload.user.email %>
+        </td>
+        <td>
+          <%= link_to(upload.key, upload.key) %>
+        </td>
+        <td>
+          <%= upload.size %>
+        </td>
+        <td>
+          <%= upload.created_at %>
+        </td>
+        <td>
+          <%= link_to "Process responses file", admin_cx_collection_detail_path(@cx_collection_detail), method: :post %>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+
+<br>
diff --git a/app/views/admin/cx_collections/_form.html.erb b/app/views/admin/cx_collections/_form.html.erb
index dc70b1c9c..d59d581d6 100644
--- a/app/views/admin/cx_collections/_form.html.erb
+++ b/app/views/admin/cx_collections/_form.html.erb
@@ -1,4 +1,4 @@
-<%= form_with(model: cx_collection, url: (cx_collection.persisted? ? admin_cx_collection_path(cx_collection) : admin_cx_collections_path), local: true, data: { turbo: false }) do |form| %>
+<%= form_with(model: cx_collection, url: (cx_collection.persisted? ? admin_cx_collection_path(cx_collection) : admin_cx_collections_path), class: "usa-form", local: true, data: { turbo: false }) do |form| %>
   <% if cx_collection.errors.any? %>
     <div id="error_explanation">
       <h2><%= pluralize(cx_collection.errors.count, "error") %> prohibited this cx_collection from being saved:</h2>
@@ -27,7 +27,7 @@
 
   <div class="field">
     <%= form.label :service_provider_id, "HISP Service Provider", class: "usa-label" %>
-    <%= form.select :service_provider_id, ServiceProvider.all.includes(:organization).map { |h| ["#{h.organization.abbreviation} - #{h.organization.name} - #{h.name}", h.id] }, { include_blank: true }, { class: "usa-select", required: true } %>
+    <%= form.select :service_provider_id, ServiceProvider.all.includes(:organization).order("organizations.abbreviation", :name).map { |h| ["#{h.organization.abbreviation} - #{h.organization.name} - #{h.name}", h.id] }, { include_blank: true }, { class: "usa-select", required: true } %>
   </div>
 
   <div class="field">
@@ -37,12 +37,12 @@
 
   <div class="field">
     <%= form.label :fiscal_year, class: "usa-label" %>
-    <%= form.text_field :fiscal_year, class: "usa-input", required: true %>
+    <%= form.select :fiscal_year, options_for_select([2024, 2025], 2024), {}, class: "usa-select", required: true %>
   </div>
 
   <div class="field">
     <%= form.label :quarter, class: "usa-label" %>
-    <%= form.number_field :quarter, class: "usa-input", required: true, min: 1, max: 4 %>
+    <%= form.select :quarter, options_for_select([1, 2, 3, 4]), {}, class: "usa-select", required: true %>
   </div>
 
   <div class="field usa-form-group">
@@ -62,7 +62,7 @@
   <div class="field">
     <%= form.label :reflection, 'Reflection text', class: "usa-label" %>
     <div class="usa-hint font-sans-3xs margin-bottom-1">
-      Please limit to 100 words.
+      Tell us what customer service improvements you were able to complete based on this quarter’s survey results. Please limit to 150 words.
     </div>
     <%= form.text_area :reflection, class: "usa-textarea" %>
   </div>
@@ -79,6 +79,17 @@
   </div>
   <% end %>
 
+  <% if !cx_collection.persisted? %>
+  <br>
+  <div class="usa-alert usa-alert--info usa-alert--slim font-sans-2xs">
+    <div class="usa-alert__body">
+      <p class="usa-alert__text">
+        After creating this collection, you can add survey results in the following screen.
+      </p>
+    </div>
+  </div>
+  <% end %>
+
   <p>
     <%= form.submit class: "usa-button" %>
   </p>
diff --git a/app/views/admin/cx_collections/show.html.erb b/app/views/admin/cx_collections/show.html.erb
index 966c9b74e..9cbc43649 100644
--- a/app/views/admin/cx_collections/show.html.erb
+++ b/app/views/admin/cx_collections/show.html.erb
@@ -89,8 +89,8 @@
     </div>
 
     <div class="services border border-base-lighter padding-2 padding-top-0 padding-bottom-0 margin-top-3">
-      <h2>
-        Services
+      <h2 class="margin-top-2">
+        Collection details
         <small>
           (<%= @cx_collection.cx_collection_details.size %>)
         </small>
@@ -98,23 +98,41 @@
       <div class="usa-alert">
         <div class="usa-alert__body">
           <p class="usa-alert__text">
-            Add a Service detail reporting page for each touchpoint available within a HISP service.
+            Add a reporting page for each touchpoint available within a service.
           </p>
         </div>
       </div>
-      <ul class="usa-list">
-      <% @cx_collection.cx_collection_details.order(:channel).each do |cx_collection| %>
-        <li>
-          <%= link_to ("#{cx_collection.try(:service).try(:name)}"), admin_cx_collection_detail_path(cx_collection) %> &middot;
-          <%= cx_collection.channel %>
-        </li>
-      <% end %>
-      </ul>
-      <% if @cx_collection.draft? %>
+      <div class="margin-bottom-2">
+        <table class="usa-table usa-table--striped width-full">
+          <thead>
+            <tr>
+              <th>Service</th>
+              <th>Transaction point</th>
+              <th>Channel</th>
+            </tr>
+          </thead>
+          <tbody>
+          <% @cx_collection.cx_collection_details.order(:channel).each do |cx_collection| %>
+            <tr>
+              <td>
+                <%= cx_collection.try(:service).try(:name) %>
+              </td>
+              <td>
+                <%= link_to cx_collection.transaction_point, admin_cx_collection_detail_path(cx_collection) %>
+              </td>
+              <td>
+                <%= cx_collection.channel %>
+              </td>
+            </tr>
+            <% end %>
+          </tbody>
+        </table>
+      </div>
+      <%- if @cx_collection.draft? %>
       <p>
         <%= link_to new_admin_cx_collection_detail_path(collection_id: @cx_collection.id), class: "usa-button usa-button--outline" do %>
           <i class="fa fa-plus"></i>
-          Add a Service to report on
+          Add detail record
         <% end %>
       </p>
       <% end %>
@@ -147,11 +165,8 @@
 
   </div>
   <div class="grid-col-4 well">
-    <br>
     <%= render 'components/step_indicator', collection: @cx_collection %>
     <p>
-      <%= label_tag :collection_status, nil, class: "usa-label" %>
-      <br>
       <%= render 'components/collection_status_tag', collection: @cx_collection %>
     </p>
     <p>
diff --git a/app/views/admin/forms/delivery.html.erb b/app/views/admin/forms/delivery.html.erb
index 2a4e26cd4..b82eb41da 100644
--- a/app/views/admin/forms/delivery.html.erb
+++ b/app/views/admin/forms/delivery.html.erb
@@ -65,7 +65,7 @@
         </div>
 
         <br>
-        <fieldset class="usa-fieldset">
+        <fieldset class="usa-fieldset  usa-form">
           How will users access this survey?
           <br>
           <legend class="usa-sr-only">Delivery methods</legend>
diff --git a/app/views/admin/forms/index.html.erb b/app/views/admin/forms/index.html.erb
index b62b6f343..c4db58003 100644
--- a/app/views/admin/forms/index.html.erb
+++ b/app/views/admin/forms/index.html.erb
@@ -90,7 +90,7 @@
         <ul class="usa-nav__primary float-menu usa-accordion">
           <li class="usa-nav__primary-item">
             <button class="usa-accordion__button usa-nav__link  usa-current" aria-expanded="false" aria-controls="extended-nav-section-one-<%= form.short_uuid %>">
-              <span><i class="fa fa-ellipsis-v"></i></span>
+              <span></span>
             </button>
             <ul id="extended-nav-section-one-<%= form.short_uuid %>" class="usa-nav__submenu" hidden="">
               <li class="usa-nav__submenu-item">
diff --git a/app/views/admin/questions/_form.html.erb b/app/views/admin/questions/_form.html.erb
index 331e13479..516e60cea 100644
--- a/app/views/admin/questions/_form.html.erb
+++ b/app/views/admin/questions/_form.html.erb
@@ -15,7 +15,7 @@
     <%= f.hidden_field :form_id, value: @form.id %>
 
     <div class="field">
-      <%= f.label :text, class: "usa-label" %>
+      <%= f.label :text, "Question text", class: "usa-label" %>
       <%= f.text_field :text, class: "usa-input" %>
     </div>
 
diff --git a/app/views/admin/service_providers/_form.html.erb b/app/views/admin/service_providers/_form.html.erb
index c4de53c37..76e7eadbb 100644
--- a/app/views/admin/service_providers/_form.html.erb
+++ b/app/views/admin/service_providers/_form.html.erb
@@ -32,15 +32,6 @@
         <%= form.label :description, class: "usa-label" %>
         <%= form.text_area :description, class: "usa-textarea" %>
       </div>
-      <% if @service_provider.persisted? %>
-        <div class="field">
-          <div class="well">
-            <div class="service-provider-managers-div">
-              <%= render 'admin/service_providers/service_provider_managers', service: @service_provider, service_provider_manager_options: @service_provider_manager_options %>
-            </div>
-          </div>
-        </div>
-      <% end %>
 
       <div class="field">
         <%= form.label :notes, class: "usa-label" %>
@@ -48,7 +39,7 @@
       </div>
 
       <% if service_manager_permissions? %>
-      <div class="well">
+      <div class="well margin-top-2">
         <span class="font-sans-3xs">
           Notice: These are experimental fields, used to generate
           <%= link_to "a 2x2 based on data", quadrants_admin_service_providers_path %>.
@@ -74,25 +65,11 @@
           class: "usa-select" %>
       </div>
 
-      <div class="field">
-        <%= form.label :department, class: "usa-label" %>
-        <%= form.text_field :department, class: "usa-input" %>
-      </div>
-
-      <div class="field">
-        <%= form.label :department_abbreviation, class: "usa-label" %>
-        <%= form.text_field :department_abbreviation, class: "usa-input" %>
-      </div>
-
-      <div class="field">
-        <%= form.label :bureau, class: "usa-label" %>
-        <%= form.text_field :bureau, class: "usa-input" %>
-      </div>
-
-      <div class="field">
-        <%= form.label :bureau_abbreviation, class: "usa-label" %>
-        <%= form.text_field :bureau_abbreviation, class: "usa-input" %>
-      </div>
+      <% if @service_provider.persisted? %>
+        <div class="service-provider-managers-div">
+          <%= render 'admin/service_providers/service_provider_managers', service: @service_provider, service_provider_manager_options: @service_provider_manager_options %>
+        </div>
+      <% end %>
 
       <div class="field">
         <%= form.label :slug, class: "usa-label" %>
diff --git a/app/views/admin/service_providers/_service_provider_managers.html.erb b/app/views/admin/service_providers/_service_provider_managers.html.erb
index fbef7dde1..6d05adf4f 100644
--- a/app/views/admin/service_providers/_service_provider_managers.html.erb
+++ b/app/views/admin/service_providers/_service_provider_managers.html.erb
@@ -1,27 +1,27 @@
 <div id="service_provider_selector" data-url="<%= admin_service_provider_path(@service_provider) %>">
   <div class="grid-row">
     <div class="grid-col-12">
-      <h3>Service Provider Managers</h3>
+      <%= label_tag :portfolio_manager_email, "Service Provider Managers", class: "usa-label" %>
       <p class="service-manager-list">
-      <ul class="usa-list usa-list--unstyled">
-        <% @service_provider.service_provider_managers.each do |manager| %>
-        <li>
-          <span class="usa-tag">
-             <%= manager.email %>
-          </span>
-          &nbsp;
-          <a href="javascript:void(0);" class="remove-tag-link" data-value="<%= manager.id %>">
-            <span class="fa fa-trash"></span>
-          </a>
-        </li>
-          <% end %>
-      </ul>
-      <p>
+        <ul class="usa-list usa-list--unstyled">
+          <% @service_provider.service_provider_managers.each do |manager| %>
+          <li>
+            <span class="usa-tag">
+              <%= manager.email %>
+            </span>
+            &nbsp;
+            <a href="javascript:void(0);" class="remove-tag-link" data-value="<%= manager.id %>">
+              <span class="fa fa-trash"></span>
+            </a>
+          </li>
+            <% end %>
+        </ul>
+      </p>
+      <%= select_tag :service_manager_id,
+        options_for_select(@service_provider_manager_options.map { |u| [u.email, u.id] }),
+        { prompt: "Select a Manager", class: "usa-select add-service-manager" } %>
     </div>
   </div>
-  <%= select_tag :service_manager_id, 
-    options_for_select(@service_provider_manager_options.map { |u| [u.email, u.id] }), 
-    { prompt: "Select a Manager", class: "usa-select add-service-manager" } %>
 </div>
 
 <script>
@@ -53,6 +53,6 @@
         }
       });
     });
-    
+
   });
 </script>
diff --git a/app/views/admin/service_providers/index.html.erb b/app/views/admin/service_providers/index.html.erb
index 3f70367d0..247550e77 100644
--- a/app/views/admin/service_providers/index.html.erb
+++ b/app/views/admin/service_providers/index.html.erb
@@ -69,7 +69,7 @@
 <p>
   <%= link_to admin_hisps_path(format: :csv), class: "usa-button usa-button--outline" do %>
     <i class="fa fa-download"></i>
-    Download as hisps.csv
+    Download hisps.csv
   <% end %> - used on <a href="https://performance.gov/cx/" target="_blank" rel="noopener">performance.gov/cx</a>
 </p>
 
diff --git a/app/views/admin/service_providers/show.html.erb b/app/views/admin/service_providers/show.html.erb
index 9f6628f44..c8d79b984 100644
--- a/app/views/admin/service_providers/show.html.erb
+++ b/app/views/admin/service_providers/show.html.erb
@@ -15,19 +15,20 @@
   <% end %>
 </p>
 
-<% if @service_provider.inactive? %>
-<div class="usa-alert usa-alert--warning">
-  <div class="usa-alert__body">
-    <h3 class="usa-alert__heading">Inactive</h3>
-    <p class="usa-alert__text">
-      This Service Provider is no longer active.
-    </p>
-  </div>
-</div>
-<% end %>
-
 <div class="grid-row grid-gap-lg">
   <div class="tablet:grid-col-8">
+
+    <% if @service_provider.inactive? %>
+    <div class="usa-alert usa-alert--warning">
+      <div class="usa-alert__body">
+        <h3 class="usa-alert__heading">Inactive</h3>
+        <p class="usa-alert__text">
+          This Service Provider is no longer active.
+        </p>
+      </div>
+    </div>
+    <% end %>
+
     <% if @service_provider.new? %>
     <p>
       <span class="usa-tag bg-primary-light">
@@ -99,21 +100,6 @@
         <%= @service_provider.portfolio_manager_email %>
       </p>
 
-      <p>
-        <strong>Department:</strong>
-        <%= @service_provider.department %>
-      </p>
-
-      <p>
-        <strong>Department abbreviation:</strong>
-        <%= @service_provider.department_abbreviation %>
-      </p>
-
-      <p>
-        <strong>Bureau:</strong>
-        <%= @service_provider.bureau %>
-      </p>
-
       <p>
         <strong>Slug:</strong>
         <%= @service_provider.slug %>
diff --git a/app/views/admin/service_stages/index.html.erb b/app/views/admin/service_stages/index.html.erb
index b098ae4f9..c616ecd61 100644
--- a/app/views/admin/service_stages/index.html.erb
+++ b/app/views/admin/service_stages/index.html.erb
@@ -2,7 +2,7 @@
   Service Stages for: <%= @service.name %>
 <% end %>
 <p>
-  <%= link_to admin_services_path(@service) do %>
+  <%= link_to admin_services_path do %>
     <i class="fa fa-arrow-circle-left"></i>
     Back to Services
   <% end %>
diff --git a/app/views/admin/services/_form.html.erb b/app/views/admin/services/_form.html.erb
index a061339a3..3a6392613 100644
--- a/app/views/admin/services/_form.html.erb
+++ b/app/views/admin/services/_form.html.erb
@@ -239,16 +239,6 @@
         </div>
 
         <% if service.persisted? && admin_permissions? %>
-        <div class="field">
-          <%= form.label :department, class: "usa-label" %>
-          <%= form.text_field :department, class: "usa-input", placeholder: "Department" %>
-        </div>
-
-        <div class="field">
-          <%= form.label :bureau, class: "usa-label" %>
-          <%= form.text_field :bureau, class: "usa-input", placeholder: "Bureau" %>
-        </div>
-
         <div class="field">
           <%= form.label :service_abbreviation, class: "usa-label" %>
           <%= form.text_field :service_abbreviation, class: "usa-input", placeholder: "service_abbreviation" %>
diff --git a/app/views/admin/services/show.html.erb b/app/views/admin/services/show.html.erb
index ce3a2c06c..ca090ee0f 100644
--- a/app/views/admin/services/show.html.erb
+++ b/app/views/admin/services/show.html.erb
@@ -69,16 +69,15 @@
       <%= @service.year_designated? ? @service.year_designated : "---" %>
     </p>
     <p>
-      <strong>Description</strong>
+      <strong>Short Description</strong>
       <br>
-      <%= @service.description? ? to_markdown(@service.description) : "---" %>
+      <%= @service.short_description? ? to_markdown(@service.short_description) : "---" %>
     </p>
     <p>
-      <strong>Short Description</strong>
+      <strong>Description</strong>
       <br>
-      <%= @service.short_description? ? to_markdown(@service.short_description) : "---" %>
+      <%= @service.description? ? to_markdown(@service.description) : "---" %>
     </p>
-
     <p>
       <strong>Service type</strong>
       <br>
@@ -172,23 +171,19 @@
     </p>
 
     <p>
-      <strong>Service Homepage URL</strong>
-      <br>
-      <%= link_to @service.homepage_url, @service.homepage_url %>
+      <%= label_tag :homepage_url, "Service Homepage URL", class: "usa-label" %>
+      <%= text_field_tag :homepage_url, @service.homepage_url, class: "usa-input", disabled: true %>
     </p>
     <p>
-      <strong>Service URL</strong>
-      <br>
-      <%= link_to @service.url, @service.url %>
+      <%= label_tag :url, "Service URL", class: "usa-label" %>
+      <%= text_field_tag :url, @service.url, class: "usa-input", disabled: true %>
     </p>
     <p>
-      <strong>What is the estimated annual customer volume?</strong>
-      <br>
-      <%= @service.estimated_annual_volume_of_customers %>
+      <%= label_tag :estimated_annual_volume_of_customers, "What is the estimated annual customer volume?", class: "usa-label" %>
+      <%= text_field_tag :estimated_annual_volume_of_customers, @service.estimated_annual_volume_of_customers, class: "usa-input", disabled: true %>
     </p>
     <p>
-      <strong>Notes</strong>
-      <br>
+      <%= label_tag :notes, nil, class: "usa-label" %>
       <%= to_markdown(@service.notes) || "empty" %>
     </p>
 
@@ -251,22 +246,12 @@
     </div>
     <% end %>
 
-    <div class="well">
+    <div class="well margin-top-1">
       <div class="font-sans-2xs">
         This information is for
         <a href="https://www.performance.gov/cx/" target="_blank" rel="noopener">performance.gov</a>
         reporting purposes.
       </div>
-      <p>
-        <strong>Department</strong>
-        <br>
-        <%= @service.department %>
-      </p>
-      <p>
-        <strong>Bureau</strong>
-        <br>
-        <%= @service.bureau %>
-      </p>
       <p>
         <strong>Service abbreviation</strong>
         <br>
diff --git a/app/views/components/_collection_status_tag.html.erb b/app/views/components/_collection_status_tag.html.erb
index ea3981d00..7d20af002 100644
--- a/app/views/components/_collection_status_tag.html.erb
+++ b/app/views/components/_collection_status_tag.html.erb
@@ -1,3 +1,3 @@
-<span class="usa-tag <%= 'bg-mint' if collection.draft? -%> <%= 'bg-accent-cool' if collection.submitted? -%> <%= 'bg-accent-warm' if collection.change_requested? -%>">
+<span class="usa-tag <%= 'bg-mint' if collection.draft? -%> <%= 'bg-accent-cool' if collection.submitted? -%> <%= 'bg-accent-warm' if collection.change_requested? -%>" title="Collection status">
   <%= collection.aasm_state %>
 </span>
diff --git a/app/views/components/forms/edit/_builder.html.erb b/app/views/components/forms/edit/_builder.html.erb
index 673151f87..ecdd00221 100644
--- a/app/views/components/forms/edit/_builder.html.erb
+++ b/app/views/components/forms/edit/_builder.html.erb
@@ -55,9 +55,13 @@
       <label class="usa-label text-uppercase font-body-3xs" for="disclaimer-text">
         Disclaimer text
       </label>
-      <small class="fba-dialog-privacy">
-        <p class="fba-disclaimer-text">
-          <textarea id="disclaimer_text" class="usa-textarea countable" name="disclaimer-text" tabindex="<%= @tabindex += 1 %>"data-url="<%= admin_form_path(form) %>"><%= form.disclaimer_text %></textarea>
+      <div class="fba-dialog-privacy font-sans-3xs">
+        <div class="fba-disclaimer-text">
+          <textarea id="disclaimer_text"
+            class="usa-textarea countable"
+            name="disclaimer-text"
+            tabindex="<%= @tabindex += 1 %>"
+            data-url="<%= admin_form_path(form) %>"><%= form.disclaimer_text %></textarea>
           <span class="usa-hint save-notice survey-disclaimer">
             <i class="fa fa-check-circle" aria-hidden="true"></i> saved
           </span>
@@ -65,9 +69,11 @@
             <%= @disclaimer_text_limit %>
             <%= t :characters_allowed %>
           </span>
-          <div id="disclaimer_text-show" tabindex="<%= @tabindex += 1 %>"><%= form.disclaimer_text.present? ? sanitize(form.disclaimer_text) : 'Survey Disclaimer Text' %></div>
-        </p>
-      </small>
+          <div id="disclaimer_text-show" class="margin-top-2" tabindex="<%= @tabindex += 1 %>">
+            <%= form.disclaimer_text.present? ? sanitize(form.disclaimer_text) : 'Survey Disclaimer Text' %>
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </div>
@@ -82,7 +88,7 @@
 $(function() {
   $(".question-option-edit").hide();
 
-  <% if form_permissions?(form: form) %>
+  <%- if form_permissions?(form: form) %>
     $('.survey-title-input').on("blur", function(event) {
       event.preventDefault();
       $('.usa-hint.save-notice.survey-title').show();
diff --git a/app/views/components/forms/question_types/_icon_checkboxes.html.erb b/app/views/components/forms/question_types/_icon_checkboxes.html.erb
index c13fe1324..5316c2d69 100644
--- a/app/views/components/forms/question_types/_icon_checkboxes.html.erb
+++ b/app/views/components/forms/question_types/_icon_checkboxes.html.erb
@@ -19,7 +19,17 @@
           <%= label_tag(nil, for: @option_id, class: "usa-checkbox__label") do %>
             <div class="text-center width-full">
               <svg class="usa-icon font-sans-3xl" aria-hidden="true" focusable="false" role="img">
-                <use xlink:href="<%= asset_path "sprite.svg#alarm" %>"></use>
+                <% if option.value == "effectiveness" %>
+                <use xlink:href="<%= asset_path "sprite.svg#check" %>"></use>
+                <% elsif option.value == "efficiency" %>
+                <use xlink:href="<%= asset_path "sprite.svg#timer" %>"></use>
+                <% elsif option.value == "ease" %>
+                <use xlink:href="<%= asset_path "sprite.svg#folder_open" %>"></use>
+                <% elsif option.value == "transparency" %>
+                <use xlink:href="<%= asset_path "sprite.svg#lightbulb_outline" %>"></use>
+                <% else %>
+                <use xlink:href="<%= asset_path "sprite.svg#info_outline" %>"></use>
+                <% end %>
               </svg>
               <br>
               <div style="margin-bottom: 40px; display: block;">
diff --git a/app/views/components/widget/_widget.css.erb b/app/views/components/widget/_widget.css.erb
index 916934ab5..0e9afbde7 100644
--- a/app/views/components/widget/_widget.css.erb
+++ b/app/views/components/widget/_widget.css.erb
@@ -4566,6 +4566,10 @@
   padding-left: 1rem;
 }
 
+.touchpoint-form .question-options {
+  clear: both;
+}
+
 .touchpoint-form {
   max-width: 35em;
   margin-left: auto;
diff --git a/config/environments/test.rb b/config/environments/test.rb
index f582fa6f3..d43e41157 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -7,14 +7,8 @@
 # your test database is "scratch space" for the test suite and is wiped
 # and recreated between test runs. Don't rely on the data there!
 require 'active_record'
-require 'bullet'
 
 Rails.application.configure do
-  config.after_initialize do
-    Bullet.enable        = true
-    Bullet.bullet_logger = true
-    Bullet.raise         = false # raise an error if n+1 query occurs
-  end
   # Settings specified here will take precedence over those in config/application.rb.
 
   config.cache_classes = true
diff --git a/config/initializers/touchpoints.rb b/config/initializers/touchpoints.rb
index e2ffb4d83..d78ba6def 100644
--- a/config/initializers/touchpoints.rb
+++ b/config/initializers/touchpoints.rb
@@ -1 +1,2 @@
-APPROVED_DOMAINS = ['.gov', '.mil', '.edu'].freeze
\ No newline at end of file
+APPROVED_DOMAINS = ['.gov', '.mil', '.edu'].freeze
+APPROVED_WEBSITE_DOMAINS = (APPROVED_DOMAINS + ['.org']).freeze
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 23e5571bc..0f9ffc498 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -145,6 +145,7 @@
     resources :cx_collection_details do
       member do
         get 'upload', to: 'cx_collection_details#upload', as: :upload
+        post 'upload', to: 'cx_collection_details#upload_csv', as: :post_csv
       end
     end
 
diff --git a/db/migrate/20231114205538_create_cx_collection_detail_uploads.rb b/db/migrate/20231114205538_create_cx_collection_detail_uploads.rb
new file mode 100644
index 000000000..8360c733f
--- /dev/null
+++ b/db/migrate/20231114205538_create_cx_collection_detail_uploads.rb
@@ -0,0 +1,12 @@
+class CreateCxCollectionDetailUploads < ActiveRecord::Migration[7.1]
+  def change
+    create_table :cx_collection_detail_uploads do |t|
+      t.integer :user_id
+      t.integer :cx_collection_detail_id
+      t.integer :size, comment: "file size of the s3 object"
+      t.string :key, comment: "s3 path to the asset"
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 695ed061b..ce48be801 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2023_11_02_184253) do
+ActiveRecord::Schema[7.1].define(version: 2023_11_14_205538) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -187,6 +187,15 @@
     t.datetime "updated_at", null: false
   end
 
+  create_table "cx_collection_detail_uploads", force: :cascade do |t|
+    t.integer "user_id"
+    t.integer "cx_collection_detail_id"
+    t.integer "size", comment: "file size of the s3 object"
+    t.string "key", comment: "s3 path to the asset"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
   create_table "cx_collection_details", force: :cascade do |t|
     t.integer "cx_collection_id"
     t.integer "service_id"
diff --git a/db/seeds.rb b/db/seeds.rb
index ec20497ed..e3088ee6f 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -134,9 +134,6 @@ def production_suitable_seeds
   name: 'Example HISP',
   description: 'Description for an example HISP',
   notes: 'notes for example HISP',
-  department: 'Example Department',
-  department_abbreviation: 'dept',
-  bureau: 'Example Bureau',
   slug: 'example-service1',
   new: false,
 })
@@ -146,9 +143,6 @@ def production_suitable_seeds
   name: 'Example High Impact Service Provider - example.gov',
   description: 'A Description of the Example HISP',
   notes: 'notes on the example.gov HISP',
-  department: 'Example',
-  department_abbreviation: 'ex',
-  bureau: 'CX Labs',
   slug: 'example-service2',
   new: false,
 })
@@ -158,9 +152,6 @@ def production_suitable_seeds
   name: 'GSA High Impact Service Provider - USA.gov',
   description: 'A Description of the USA.gov HISP',
   notes: 'notes on the usa.gov HISP',
-  department: 'General Services Administration',
-  department_abbreviation: 'gsa',
-  bureau: 'Technology Transformation Services',
   slug: 'gsa-usagov',
   new: true,
 })
diff --git a/spec/features/admin/forms_spec.rb b/spec/features/admin/forms_spec.rb
index afc260a94..46b996b89 100644
--- a/spec/features/admin/forms_spec.rb
+++ b/spec/features/admin/forms_spec.rb
@@ -1379,11 +1379,11 @@
           before do
             visit questions_admin_form_path(form2)
             expect(page).to have_selector('.form-add-question', count: 2)
-
-            find_all('.form-add-question').first.click
+            find("#form_section_1").find('.form-add-question').click
             fill_in 'question_text', with: 'Question in Form Section 1'
             select('text_field', from: 'question_question_type')
             click_on 'Update Question'
+            expect(page).to have_css(".usa-tag", text: "ANSWER_02")
             # Select the Add Question button in the 2nd Form Section
             visit questions_admin_form_path(form2)
             expect(find_all('.form-add-question').size).to eq(2)
diff --git a/spec/features/admin/service_providers_spec.rb b/spec/features/admin/service_providers_spec.rb
index 356f3482a..0c99b16d9 100644
--- a/spec/features/admin/service_providers_spec.rb
+++ b/spec/features/admin/service_providers_spec.rb
@@ -25,7 +25,7 @@
         expect(page).to have_content('Service Providers')
         expect(page.current_path).to eq(admin_service_providers_path)
         expect(page).to have_content(service_provider.name)
-        expect(page).to have_content('Download as hisps.csv')
+        expect(page).to have_content('Download hisps.csv')
       end
     end
 
diff --git a/spec/models/cx_collection_detail_upload_spec.rb b/spec/models/cx_collection_detail_upload_spec.rb
new file mode 100644
index 000000000..93133d256
--- /dev/null
+++ b/spec/models/cx_collection_detail_upload_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe CxCollectionDetailUpload, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

From d2cd16ccba116ca8bdfaf9a03b2924e28f653ec4 Mon Sep 17 00:00:00 2001
From: Ryan Wold <ryan.wold@gsa.gov>
Date: Fri, 17 Nov 2023 16:10:47 -0800
Subject: [PATCH 4/7] set uploads bucket

---
 config/initializers/vcap_services.rb | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/config/initializers/vcap_services.rb b/config/initializers/vcap_services.rb
index 17b3270dd..65c52d5cf 100644
--- a/config/initializers/vcap_services.rb
+++ b/config/initializers/vcap_services.rb
@@ -10,6 +10,7 @@ def set_s3!(vcap_services_json)
   s3_settings = vcap_services_json['s3']
   return false if s3_settings.blank?
 
+  # S3 Organization logos
   s3_credentials = s3_settings[0]['credentials']
   raise StandardError, 's3 credentials could not be derived from Cloud Foundry VCAP_SERVICES' if s3_credentials.blank?
 
@@ -21,6 +22,16 @@ def set_s3!(vcap_services_json)
   ENV['S3_AWS_REGION'] = s3_credentials['region']
   ENV['S3_AWS_BUCKET_NAME'] = s3_credentials['bucket']
   Rails.logger.debug 'Set S3_AWS... ENV variables via vcap_services.rb'
+
+  # S3 uploads
+  s3_upload_credentials = s3_settings[1]['credentials']
+  raise StandardError, 's3 credentials could not be derived from Cloud Foundry VCAP_SERVICES' if s3_upload_credentials.blank?
+
+  ENV['S3_UPLOADS_AWS_ACCESS_KEY_ID'] = s3_upload_credentials['access_key_id']
+  ENV['S3_UPLOADS_AWS_SECRET_ACCESS_KEY'] = s3_upload_credentials['secret_access_key']
+  ENV['S3_UPLOADS_AWS_REGION'] = s3_upload_credentials['region']
+  ENV['S3_UPLOADS_AWS_BUCKET_NAME'] = s3_upload_credentials['bucket']
+  Rails.logger.debug 'Set S3_UPLOADS_AWS... ENV variables via vcap_services.rb'
 end
 
 def set_redis!(vcap_services_json)

From d25d4a6e076ebfb3c37e863ebc47e8df1a7eb14b Mon Sep 17 00:00:00 2001
From: Ryan Wold <ryan.wold@gsa.gov>
Date: Fri, 17 Nov 2023 16:50:42 -0800
Subject: [PATCH 5/7] s3 configs

---
 s3.rb | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 s3.rb

diff --git a/s3.rb b/s3.rb
new file mode 100644
index 000000000..2ca4c3ea3
--- /dev/null
+++ b/s3.rb
@@ -0,0 +1,9 @@
+require "aws-sdk-s3"
+
+Aws.config.update(
+  region: ENV.fetch("S3_UPLOADS_AWS_REGION"),
+  credentials: Aws::Credentials.new(
+      ENV.fetch("S3_UPLOADS_AWS_ACCESS_KEY_ID"),
+      ENV.fetch("S3_UPLOADS_AWS_SECRET_ACCESS_KEY")
+    )
+)

From 24076241656ee6f43923f394cb3a1b37543efb74 Mon Sep 17 00:00:00 2001
From: Ryan Wold <ryan.wold@gsa.gov>
Date: Fri, 17 Nov 2023 17:06:14 -0800
Subject: [PATCH 6/7] ensure vars are set

---
 s3.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/s3.rb b/s3.rb
index 2ca4c3ea3..69aec9fa5 100644
--- a/s3.rb
+++ b/s3.rb
@@ -1,4 +1,5 @@
 require "aws-sdk-s3"
+require_relative 'vcap_services'
 
 Aws.config.update(
   region: ENV.fetch("S3_UPLOADS_AWS_REGION"),

From d25a66bed1649e7d75988c6262921f1fbb4fd763 Mon Sep 17 00:00:00 2001
From: Ryan Wold <ryan.wold@gsa.gov>
Date: Mon, 20 Nov 2023 09:36:33 -0800
Subject: [PATCH 7/7] update gems

---
 Gemfile.lock | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index a0f39eaad..45c08d3cd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -105,10 +105,10 @@ GEM
     aes_key_wrap (1.1.0)
     ast (2.4.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.849.0)
+    aws-partitions (1.853.0)
     aws-record (2.13.0)
       aws-sdk-dynamodb (~> 1, >= 1.85.0)
-    aws-sdk-core (3.186.0)
+    aws-sdk-core (3.187.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.5)
@@ -146,7 +146,7 @@ GEM
     aws-sigv4 (1.6.1)
       aws-eventstream (~> 1, >= 1.0.2)
     base64 (0.2.0)
-    bcrypt (3.1.19)
+    bcrypt (3.1.20)
     bigdecimal (3.1.4)
     bindata (2.4.15)
     bindex (0.8.1)
@@ -154,7 +154,7 @@ GEM
       msgpack (~> 1.2)
     brakeman (6.0.1)
     builder (3.2.4)
-    bullet (7.1.3)
+    bullet (7.1.4)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     bundler-audit (0.9.1)
@@ -321,7 +321,7 @@ GEM
       net-protocol
     newrelic_rpm (9.6.0)
       base64
-    nio4r (2.5.9)
+    nio4r (2.6.0)
     nokogiri (1.15.4)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
@@ -361,7 +361,7 @@ GEM
       method_source (~> 1.0)
     psych (5.1.1.1)
       stringio
-    public_suffix (5.0.3)
+    public_suffix (5.0.4)
     puma (6.4.0)
       nio4r (~> 2.0)
     racc (1.7.3)
@@ -474,10 +474,11 @@ GEM
       rubocop (~> 1.41)
     rubocop-factory_bot (2.24.0)
       rubocop (~> 1.33)
-    rubocop-rails (2.22.1)
+    rubocop-rails (2.22.2)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
     rubocop-rspec (2.25.0)
       rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)