diff --git a/app/controllers/facilitators_controller.rb b/app/controllers/facilitators_controller.rb
index 137434bc9..dd9736da5 100644
--- a/app/controllers/facilitators_controller.rb
+++ b/app/controllers/facilitators_controller.rb
@@ -98,8 +98,10 @@ def facilitator_params
         :primary_email_address, :primary_email_address_type,
         :street_address, :city, :state, :zip, :country, :mailing_address_type,
         :phone_number, :phone_number_type,
+        :phone_number_2, :phone_number_3, :best_time_to_call,
+        :date_of_birth,
         :created_by_id, :updated_by_id,
-        :bio,
+        :bio, :notes,
         :display_name_preference,
         :pronouns,
         :profile_show_name_preference,
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index e5fef04f5..6e2a25785 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -91,12 +91,26 @@ def generate_facilitator
         last_name: @user.last_name,
         primary_email_address: @user.email,
         phone_number: @user.phone,
+        phone_number_2: @user.phone2,
+        phone_number_3: @user.phone3,
+        best_time_to_call: @user.best_time_to_call,
+        date_of_birth: @user.birthday,
         street_address: @user.address,
         city: @user.city,
         state: @user.state,
         zip: @user.zip,
         created_by: current_user,
-        updated_by: current_user
+        updated_by: current_user,
+        notes: @user.notes,
+        # comment: @user.comment,
+        # t.string "address2"
+        # t.integer "agency_id"
+        # t.string "city2"
+        # t.boolean "inactive", default: false
+        # t.integer "primary_address"
+        # t.string "state2"
+        # t.string "subscribecode"
+        # t.string "zip2"
       )
       if @facilitator.save
         redirect_to @facilitator, notice: "Facilitator was successfully created for this user." and return
diff --git a/app/helpers/facilitator_helper.rb b/app/helpers/facilitator_helper.rb
index 0dc429964..8f7be57eb 100644
--- a/app/helpers/facilitator_helper.rb
+++ b/app/helpers/facilitator_helper.rb
@@ -1,8 +1,10 @@
 module FacilitatorHelper
-
 	def facilitator_profile_button(facilitator, size: 10)
 		link_to facilitator_path(facilitator),
-						class: "btn btn-secondary-outline flex items-center gap-3 px-4 py-2 rounded-lg" do
+						class: "group inline-flex items-center gap-2 px-4 py-2
+                  border border-primary text-primary rounded-lg
+                  hover:bg-primary hover:text-white transition-colors duration-200
+                  font-medium shadow-sm leading-none whitespace-nowrap w-60" do
 
 			facilitator = facilitator.decorate
 
@@ -10,32 +12,40 @@ def facilitator_profile_button(facilitator, size: 10)
 			avatar = if facilitator.avatar_image.present?
 								 image_tag url_for(facilitator.avatar_image.file),
 													 class: "w-10 h-10 rounded-full object-cover border border-gray-300 shadow-sm"
+							 elsif facilitator.user&.avatar.present?
+								 image_tag url_for(facilitator.user.avatar),
+													 class: "w-10 h-10 rounded-full object-cover border border-gray-300 shadow-sm"
 							 else
 								 image_tag "missing.png",
 													 class: "w-10 h-10 rounded-full object-cover border border-dashed border-gray-300"
 							 end
 
-			# --- Name (forced single line) ---
+			# --- Name: stays one line & turns white on hover ---
 			name = content_tag(
 				:span,
-				facilitator.name.to_s.truncate(28),        # Prevent spillover
-				class: "font-semibold text-gray-900 whitespace-nowrap"
+				facilitator.name.to_s.truncate(21),
+				title: facilitator.name.to_s,
+				class: "font-semibold text-gray-900 whitespace-nowrap group-hover:text-white"
 			)
 
-			# --- Pronouns (small, optional, below) ---
+			# --- Pronouns ---
 			pronouns = if facilitator.pronouns_display.present?
-									 content_tag(:span,
-															 facilitator.pronouns_display,
-															 class: "text-xs text-gray-500 italic")
+									 content_tag(
+										 :span,
+										 facilitator.pronouns_display,
+										 class: "text-xs text-gray-500 italic group-hover:text-white"
+									 )
 								 end
 
-			# --- Text Block ---
-			text_block = content_tag(:div,
-															 safe_join([name, pronouns].compact),
-															 class: "flex flex-col leading-tight text-left")
+			text_block = content_tag(
+				:div,
+				safe_join([name, pronouns].compact),
+				class: "flex flex-col leading-tight text-left"
+			)
 
 			avatar + text_block
 		end
 	end
 
+
 end
diff --git a/app/views/events/_card.html.erb b/app/views/events/_card.html.erb
index e7355743a..cc6cd3c71 100644
--- a/app/views/events/_card.html.erb
+++ b/app/views/events/_card.html.erb
@@ -11,7 +11,7 @@
   </div>
 
   <!-- 1️⃣ Thumbnail + Title Row -->
-  <div class="flex flex-col md:flex-row gap-4">
+  <div class="flex flex-col md:flex-row gap-2">
 
     <!-- Thumbnail -->
     <div class="flex-shrink-0 w-32 h-24 rounded overflow-hidden bg-gray-100 relative">
@@ -30,7 +30,7 @@
     </div>
 
     <!-- Title + badges -->
-    <div class="flex flex-col gap-2 flex-1 min-w-0 mr-4 mt-1">
+    <div class="flex flex-col gap-2 flex-1 min-w-0 pr-1 mr-4 mt-1">
       <%= link_to event_path(event),
                   class: "hover:underline block leading-tight",
                   data: { turbo: false } do %>
diff --git a/app/views/facilitators/_form.html.erb b/app/views/facilitators/_form.html.erb
index 44238ef71..3320eae0a 100644
--- a/app/views/facilitators/_form.html.erb
+++ b/app/views/facilitators/_form.html.erb
@@ -12,8 +12,8 @@
       <div class="flex-1" style="flex: 0 0 75%;">
         <div class="space-y-6">
           <div class="flex flex-col md:flex-row gap-4">
-            <%= u.input :first_name %>
-            <%= u.input :last_name %>
+            <%= f.input :first_name %>
+            <%= f.input :last_name %>
 
             <div>
               <label class="block text-md font-medium text-gray-700 mb-1">Email</label>
@@ -27,7 +27,7 @@
 
           <div class="flex flex-col md:flex-row gap-4">
             <%= f.input :pronouns %>
-            <%= u.input :birthday,
+            <%= f.input :date_of_birth,
                         as: :string,
                         input_html: {
                           type: "date",
@@ -66,10 +66,10 @@
       <h3 class="font-semibold text-gray-700 mb-2">Phones</h3>
       <div class="rounded-lg border border-gray-200 bg-gray-50 p-4 mb-4 shadow-sm">
         <div class="flex flex-col md:flex-row gap-4">
-          <%= u.input :phone %>
-          <%= u.input :phone2 %>
-          <%= u.input :phone3 %>
-          <%= u.input :best_time_to_call %>
+          <%= f.input :phone_number %>
+          <%= f.input :phone_number_2 %>
+          <%= f.input :phone_number_3 %>
+          <%= f.input :best_time_to_call %>
         </div>
       </div>
     </div>
@@ -112,7 +112,7 @@
         <span class="text-sm font-normal text-gray-500">(only editable by admins)</span>
       </div>
       <div class="rounded-lg border border-gray-200 bg-gray-50 p-4 mb-4 shadow-sm">
-        <% if false && current_user.super_user? %>
+        <% if current_user.super_user? %>
           <div class="admin-only bg-blue-100 p-3">
             <%= u.fields_for :project_users do |project_user_form| %>
               <%= render "project_user_fields",
diff --git a/app/views/facilitators/_search_boxes.html.erb b/app/views/facilitators/_search_boxes.html.erb
index 64c82fa14..43888cdfc 100644
--- a/app/views/facilitators/_search_boxes.html.erb
+++ b/app/views/facilitators/_search_boxes.html.erb
@@ -2,12 +2,12 @@
   <div class="flex flex-col md:flex-row md:flex-wrap md:items-end gap-4 mb-6">
     <!-- Contact info -->
     <div class="w-full md:flex-1">
-      <%= label_tag :contact_info, "Name, email, phone", class: "block text-sm font-medium text-gray-700 mb-1" %>
+      <%= label_tag :contact_info, "Name, email, or phone", class: "block text-sm font-medium text-gray-700 mb-1" %>
       <div class="relative">
         <%= text_field_tag :contact_info, params[:contact_info],
                            class: "w-full rounded-lg border border-gray-300 px-3 py-2 text-gray-800 shadow-sm
                 focus:border-blue-500 focus:ring focus:ring-blue-200 focus:outline-none",
-                           placeholder: "Type and hit Enter",
+                           placeholder: "",
                            onkeypress: "if(event.key === 'Enter'){ this.form.submit(); }" %>
         <button type="submit"
                 class="absolute inset-y-0 right-0 flex items-center pr-3 text-gray-500 hover:text-blue-600"
@@ -24,7 +24,7 @@
         <%= text_field_tag :sector_name, params[:sector_name],
                            class: "w-full rounded-lg border border-gray-300 px-3 py-2 text-gray-800 shadow-sm
                 focus:border-blue-500 focus:ring focus:ring-blue-200 focus:outline-none",
-                           placeholder: "Type and hit Enter",
+                           placeholder: "",
                            onkeypress: "if(event.key === 'Enter'){ this.form.submit(); }" %>
         <button type="submit"
                 class="absolute inset-y-0 right-0 flex items-center pr-3 text-gray-500 hover:text-blue-600"
@@ -41,7 +41,7 @@
         <%= text_field_tag :project_name, params[:project_name],
                            class: "w-full rounded-lg border border-gray-300 px-3 py-2 text-gray-800 shadow-sm
                 focus:border-blue-500 focus:ring focus:ring-blue-200 focus:outline-none",
-                           placeholder: "Type and hit Enter",
+                           placeholder: "",
                            onkeypress: "if(event.key === 'Enter'){ this.form.submit(); }" %>
         <button type="submit"
                 class="absolute inset-y-0 right-0 flex items-center pr-3 text-gray-500 hover:text-blue-600"
diff --git a/app/views/facilitators/index.html.erb b/app/views/facilitators/index.html.erb
index 255f53834..19d626a95 100644
--- a/app/views/facilitators/index.html.erb
+++ b/app/views/facilitators/index.html.erb
@@ -24,11 +24,13 @@
             <thead class="bg-gray-100">
               <tr>
                 <th class="px-4 py-2 text-left text-sm font-semibold text-gray-700 w-1/6">Name</th>
-                <th class="px-4 py-2 text-left text-sm font-semibold text-gray-700 w-1/6">Facilitator since</th>
+                <th class="px-4 py-2 text-center text-sm font-semibold text-gray-700 w-1/6">Facilitator since</th>
                 <th class="px-4 py-2 text-left text-sm font-semibold text-gray-700 w-1/6">Sector(s)</th>
                 <th class="px-4 py-2 text-left text-sm font-semibold text-gray-700 w-1/3">Affiliation(s)</th>
                 <th class="px-4 py-2 text-left text-sm font-semibold text-gray-700 w-1/6">Socials</th>
-                <th class="px-4 py-2 text-center text-sm font-semibold text-gray-700 w-[80px]">Actions</th>
+                <% if current_user.super_user? %>
+                  <th class="px-4 py-2 text-center text-sm font-semibold text-gray-700 w-[80px]">Actions</th>
+                <% end %>
               </tr>
             </thead>
 
@@ -40,13 +42,21 @@
                   <%= facilitator_profile_button(facilitator) %>
                 </td>
 
-                <td class="px-4 py-2 text-sm text-gray-800">
+                <td class="px-4 py-2 text-center text-sm text-gray-800">
                   <%= facilitator.member_since_year %>
                 </td>
 
                 <!-- Sectors -->
                 <td class="px-4 py-2 text-sm text-gray-800">
-                  <%= facilitator.sector_list.join(", ") %>
+                  <div class="flex flex-wrap gap-2">
+                    <% facilitator.sectorable_items.each do |si| %>
+                      <% si_name = "#{ si.sector.name }#{ " (#{"leader"})" if si.is_leader? }" %>
+                      <span class="inline-flex items-center px-2 py-1 rounded-full text-xs
+                      font-medium bg-gray-400 text-white whitespace-nowrap">
+                        <%= link_to si_name, authenticated_root_path %>
+                      </span>
+                    <% end %>
+                  </div>
                 </td>
 
                 <!-- Organizations -->
@@ -67,14 +77,14 @@
                 </td>
 
                 <!-- Actions -->
-                <td class="px-4 py-2 justify-center gap-2">
-                  <% if current_user.super_user? %>
+                <% if current_user.super_user? %>
+                  <td class="px-4 py-2 justify-center gap-2">
                     <%= link_to "User", user_path(facilitator.user),
                                 class: "admin-only bg-blue-100 btn btn-secondary-outline" if facilitator.user %>
                     <%= link_to "Edit", edit_facilitator_path(facilitator),
                                 class: "admin-only bg-blue-100 btn btn-secondary-outline" %>
-                  <% end %>
-                </td>
+                  </td>
+                <% end %>
               </tr>
             <% end %>
             </tbody>
diff --git a/app/views/facilitators/show.html.erb b/app/views/facilitators/show.html.erb
index 243d5369b..f32b77caa 100644
--- a/app/views/facilitators/show.html.erb
+++ b/app/views/facilitators/show.html.erb
@@ -13,7 +13,10 @@
       <!-- Header: avatar + name + pronouns -->
       <div class="flex flex-col md:flex-row md:items-center md:gap-8 mb-10">
         <div class="flex-shrink-0 flex justify-center md:justify-start">
-          <% if @facilitator.user.avatar.attached? %>
+          <% if @facilitator.avatar_image&.file&.attached? %>
+            <%= image_tag url_for(@facilitator.avatar_image.file),
+                          class: "w-32 h-32 rounded-full object-cover border border-gray-200 shadow-sm" %>
+          <% elsif @facilitator.user&.avatar&.attached? %>
             <%= image_tag url_for(@facilitator.user.avatar),
                           class: "w-32 h-32 rounded-full object-cover border border-gray-200 shadow-sm" %>
           <% else %>
diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb
index 9822eab18..6e8a0d7d0 100644
--- a/app/views/users/_form.html.erb
+++ b/app/views/users/_form.html.erb
@@ -90,7 +90,7 @@
   <!-- Notes -->
   <% if current_user.super_user? %>
     <div class="admin-only bg-blue-100 p-3">
-      <%= f.input :notes, as: :text, input_html: { rows: 3, class: "w-full" } %>
+      <%= f.input :comment, as: :text, input_html: { rows: 3, class: "w-full" } %>
     </div>
   <% end %>
 
diff --git a/db/migrate/20251204024120_add_fields_to_facilitator.rb b/db/migrate/20251204024120_add_fields_to_facilitator.rb
new file mode 100644
index 000000000..3c6b62191
--- /dev/null
+++ b/db/migrate/20251204024120_add_fields_to_facilitator.rb
@@ -0,0 +1,11 @@
+class AddFieldsToFacilitator < ActiveRecord::Migration[8.1]
+  def change
+    add_column :facilitators, :phone_number_2, :string
+    add_column :facilitators, :phone_number_3, :string
+    add_column :facilitators, :best_time_to_call, :string
+
+    add_column :facilitators, :notes, :text
+
+    add_column :facilitators, :date_of_birth, :date
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index c48dbf708..99d3cf784 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,8 +10,8 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.1].define(version: 2025_11_25_131123) do
-  create_table "active_storage_attachments", charset: "utf8mb3", force: :cascade do |t|
+ActiveRecord::Schema[8.1].define(version: 2025_12_04_024120) do
+  create_table "active_storage_attachments", charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.bigint "blob_id", null: false
     t.datetime "created_at", precision: nil, null: false
     t.string "name", null: false
@@ -21,7 +21,7 @@
     t.index ["record_type", "record_id", "name", "blob_id"], name: "index_active_storage_attachments_uniqueness", unique: true
   end
 
-  create_table "active_storage_blobs", charset: "utf8mb3", force: :cascade do |t|
+  create_table "active_storage_blobs", charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.string "aws_key"
     t.bigint "byte_size", null: false
     t.string "checksum"
@@ -29,18 +29,18 @@
     t.datetime "created_at", precision: nil, null: false
     t.string "filename", null: false
     t.string "key", null: false
-    t.text "metadata"
+    t.text "metadata", size: :medium
     t.string "service_name", null: false
     t.index ["key"], name: "index_active_storage_blobs_on_key", unique: true
   end
 
-  create_table "active_storage_variant_records", charset: "utf8mb3", force: :cascade do |t|
+  create_table "active_storage_variant_records", charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.bigint "blob_id", null: false
     t.string "variation_digest", null: false
     t.index ["blob_id", "variation_digest"], name: "index_active_storage_variant_records_uniqueness", unique: true
   end
 
-  create_table "addresses", charset: "utf8mb3", force: :cascade do |t|
+  create_table "addresses", charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.string "address_type"
     t.bigint "addressable_id"
     t.string "addressable_type"
@@ -62,7 +62,7 @@
     t.index ["addressable_type", "addressable_id"], name: "index_addresses_on_addressable"
   end
 
-  create_table "admins", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "admins", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.datetime "created_at", precision: nil
     t.datetime "current_sign_in_at", precision: nil
     t.string "current_sign_in_ip"
@@ -81,7 +81,7 @@
     t.index ["reset_password_token"], name: "index_admins_on_reset_password_token", unique: true
   end
 
-  create_table "age_ranges", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "age_ranges", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.datetime "created_at", precision: nil, null: false
     t.string "name"
     t.datetime "updated_at", precision: nil, null: false
@@ -89,14 +89,14 @@
     t.index ["windows_type_id"], name: "index_age_ranges_on_windows_type_id"
   end
 
-  create_table "answer_options", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "answer_options", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.datetime "created_at", precision: nil, null: false
     t.string "name"
     t.integer "order"
     t.datetime "updated_at", precision: nil, null: false
   end
 
-  create_table "attachments", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "attachments", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.datetime "created_at", precision: nil, null: false
     t.string "file_content_type"
     t.string "file_file_name"
@@ -107,8 +107,8 @@
     t.datetime "updated_at", precision: nil, null: false
   end
 
-  create_table "banners", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
-    t.text "content"
+  create_table "banners", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
+    t.text "content", size: :medium
     t.datetime "created_at", precision: nil, null: false
     t.integer "created_by_id"
     t.boolean "show"
@@ -118,15 +118,15 @@
     t.index ["updated_by_id"], name: "index_banners_on_updated_by_id"
   end
 
-  create_table "bookmark_annotations", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
-    t.text "annotation", size: :medium
+  create_table "bookmark_annotations", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
+    t.text "annotation", size: :long
     t.integer "bookmark_id"
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
     t.index ["bookmark_id"], name: "index_bookmark_annotations_on_bookmark_id"
   end
 
-  create_table "bookmarks", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "bookmarks", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.integer "bookmarkable_id"
     t.string "bookmarkable_type"
     t.datetime "created_at", precision: nil, null: false
@@ -135,7 +135,7 @@
     t.index ["user_id"], name: "index_bookmarks_on_user_id"
   end
 
-  create_table "categories", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "categories", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.datetime "created_at", precision: nil, null: false
     t.integer "legacy_id"
     t.integer "metadatum_id"
@@ -145,7 +145,7 @@
     t.index ["metadatum_id"], name: "index_categories_on_metadatum_id"
   end
 
-  create_table "categorizable_items", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "categorizable_items", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.integer "categorizable_id"
     t.string "categorizable_type"
     t.integer "category_id"
@@ -157,7 +157,7 @@
     t.index ["category_id"], name: "index_categorizable_items_on_category_id"
   end
 
-  create_table "ckeditor_assets", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "ckeditor_assets", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.string "actual_url"
     t.integer "assetable_id"
     t.string "assetable_type", limit: 30
@@ -173,9 +173,9 @@
     t.index ["assetable_type", "type", "assetable_id"], name: "idx_ckeditor_assetable_type"
   end
 
-  create_table "community_news", charset: "utf8mb3", force: :cascade do |t|
+  create_table "community_news", charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.integer "author_id", null: false
-    t.text "body"
+    t.text "body", size: :medium
     t.datetime "created_at", null: false
     t.integer "created_by_id", null: false
     t.boolean "featured"
@@ -194,7 +194,7 @@
     t.index ["windows_type_id"], name: "index_community_news_on_windows_type_id"
   end
 
-  create_table "event_registrations", charset: "utf8mb3", force: :cascade do |t|
+  create_table "event_registrations", charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.datetime "created_at", null: false
     t.bigint "event_id"
     t.integer "registrant_id"
@@ -204,10 +204,10 @@
     t.index ["registrant_id"], name: "index_event_registrations_on_registrant_id"
   end
 
-  create_table "events", charset: "utf8mb3", force: :cascade do |t|
+  create_table "events", charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.datetime "created_at", null: false
     t.integer "created_by_id"
-    t.text "description"
+    t.text "description", size: :medium
     t.datetime "end_date", precision: nil
     t.boolean "featured", default: false, null: false
     t.boolean "publicly_visible", default: false, null: false
@@ -218,12 +218,14 @@
     t.index ["created_by_id"], name: "index_events_on_created_by_id"
   end
 
-  create_table "facilitators", id: :integer, charset: "utf8mb3", force: :cascade do |t|
-    t.text "bio"
+  create_table "facilitators", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
+    t.string "best_time_to_call"
+    t.text "bio", size: :medium
     t.string "city"
     t.string "country"
     t.datetime "created_at", null: false
     t.integer "created_by_id"
+    t.date "date_of_birth"
     t.string "display_name_preference"
     t.string "facebook_url"
     t.string "first_name", null: false
@@ -232,7 +234,10 @@
     t.string "linked_in_url"
     t.string "mailing_address_type"
     t.date "member_since"
+    t.text "notes"
     t.string "phone_number"
+    t.string "phone_number_2"
+    t.string "phone_number_3"
     t.string "phone_number_type"
     t.string "primary_email_address"
     t.string "primary_email_address_type"
@@ -264,8 +269,8 @@
     t.index ["updated_by_id"], name: "index_facilitators_on_updated_by_id"
   end
 
-  create_table "faqs", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
-    t.text "answer", size: :medium
+  create_table "faqs", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
+    t.text "answer", size: :long
     t.datetime "created_at", precision: nil, null: false
     t.boolean "inactive"
     t.integer "ordering"
@@ -273,7 +278,7 @@
     t.datetime "updated_at", precision: nil, null: false
   end
 
-  create_table "footers", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "footers", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.string "adult_program"
     t.string "children_program"
     t.datetime "created_at", precision: nil, null: false
@@ -282,9 +287,9 @@
     t.datetime "updated_at", precision: nil, null: false
   end
 
-  create_table "form_builders", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "form_builders", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.datetime "created_at", precision: nil, null: false
-    t.text "description", size: :medium
+    t.text "description", size: :long
     t.string "name"
     t.integer "owner_type"
     t.datetime "updated_at", precision: nil, null: false
@@ -292,7 +297,7 @@
     t.index ["windows_type_id"], name: "index_form_builders_on_windows_type_id"
   end
 
-  create_table "form_field_answer_options", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "form_field_answer_options", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.integer "answer_option_id"
     t.datetime "created_at", precision: nil, null: false
     t.integer "form_field_id"
@@ -301,7 +306,7 @@
     t.index ["form_field_id"], name: "index_form_field_answer_options_on_form_field_id"
   end
 
-  create_table "form_fields", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "form_fields", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.integer "answer_datatype"
     t.integer "answer_type"
     t.datetime "created_at", precision: nil, null: false
@@ -316,7 +321,7 @@
     t.index ["form_id"], name: "index_form_fields_on_form_id"
   end
 
-  create_table "forms", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "forms", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.datetime "created_at", precision: nil, null: false
     t.integer "form_builder_id"
     t.integer "owner_id"
@@ -325,7 +330,7 @@
     t.index ["form_builder_id"], name: "index_forms_on_form_builder_id"
   end
 
-  create_table "images", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "images", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.datetime "created_at", precision: nil, null: false
     t.string "file_content_type"
     t.string "file_file_name"
@@ -340,7 +345,7 @@
     t.index ["type"], name: "index_images_on_type"
   end
 
-  create_table "locations", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "locations", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.string "city"
     t.string "country"
     t.datetime "created_at", precision: nil, null: false
@@ -348,7 +353,7 @@
     t.datetime "updated_at", precision: nil, null: false
   end
 
-  create_table "media_files", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "media_files", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.string "file_content_type"
     t.string "file_file_name"
     t.integer "file_file_size"
@@ -357,7 +362,7 @@
     t.integer "workshop_log_id"
   end
 
-  create_table "metadata", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "metadata", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.datetime "created_at", precision: nil, null: false
     t.string "legacy_id"
     t.string "name"
@@ -365,17 +370,17 @@
     t.datetime "updated_at", precision: nil, null: false
   end
 
-  create_table "monthly_reports", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "monthly_reports", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.string "best_call_time"
     t.boolean "call_requested"
-    t.text "comments", size: :medium
+    t.text "comments", size: :long
     t.datetime "created_at", precision: nil, null: false
-    t.text "goals", size: :medium
-    t.text "goals_reached", size: :medium
+    t.text "goals", size: :long
+    t.text "goals_reached", size: :long
     t.boolean "mail_evaluations"
     t.string "month"
-    t.text "most_challenging", size: :medium
-    t.text "most_effective", size: :medium
+    t.text "most_challenging", size: :long
+    t.text "most_effective", size: :long
     t.string "name"
     t.string "num_new_participants"
     t.string "num_ongoing_participants"
@@ -388,7 +393,7 @@
     t.index ["project_user_id"], name: "index_monthly_reports_on_project_user_id"
   end
 
-  create_table "notifications", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "notifications", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.datetime "created_at", precision: nil, null: false
     t.integer "noticeable_id"
     t.string "noticeable_type"
@@ -396,26 +401,26 @@
     t.datetime "updated_at", precision: nil, null: false
   end
 
-  create_table "permissions", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "permissions", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.datetime "created_at", precision: nil, null: false
     t.integer "legacy_id"
     t.string "security_cat"
     t.datetime "updated_at", precision: nil, null: false
   end
 
-  create_table "project_obligations", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "project_obligations", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.datetime "created_at", precision: nil, null: false
     t.string "name"
     t.datetime "updated_at", precision: nil, null: false
   end
 
-  create_table "project_statuses", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "project_statuses", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.datetime "created_at", precision: nil, null: false
     t.string "name"
     t.datetime "updated_at", precision: nil, null: false
   end
 
-  create_table "project_users", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "project_users", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.integer "agency_id"
     t.datetime "created_at", precision: nil, null: false
     t.string "filemaker_code"
@@ -430,11 +435,11 @@
     t.index ["user_id"], name: "index_project_users_on_user_id"
   end
 
-  create_table "projects", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "projects", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.string "agency_type"
     t.string "agency_type_other"
     t.datetime "created_at", precision: nil, null: false
-    t.text "description", size: :medium
+    t.text "description", size: :long
     t.date "end_date"
     t.string "filemaker_code"
     t.boolean "inactive", default: false
@@ -444,7 +449,7 @@
     t.integer "location_id"
     t.string "mission_vision_values"
     t.string "name"
-    t.text "notes", size: :medium
+    t.text "notes", size: :long
     t.integer "project_status_id"
     t.date "start_date"
     t.datetime "updated_at", precision: nil, null: false
@@ -455,7 +460,7 @@
     t.index ["windows_type_id"], name: "index_projects_on_windows_type_id"
   end
 
-  create_table "quotable_item_quotes", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "quotable_item_quotes", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.datetime "created_at", precision: nil, null: false
     t.integer "legacy_id"
     t.integer "quotable_id"
@@ -465,22 +470,22 @@
     t.index ["quote_id"], name: "index_quotable_item_quotes_on_quote_id"
   end
 
-  create_table "quotes", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "quotes", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.string "age"
     t.datetime "created_at", precision: nil, null: false
     t.string "gender", limit: 1
     t.boolean "inactive", default: true
     t.boolean "legacy", default: false
     t.integer "legacy_id"
-    t.text "quote", size: :medium
+    t.text "quote", size: :long
     t.string "speaker_name"
     t.datetime "updated_at", precision: nil, null: false
     t.integer "workshop_id"
     t.index ["workshop_id"], name: "index_quotes_on_workshop_id"
   end
 
-  create_table "report_form_field_answers", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
-    t.text "answer", size: :medium
+  create_table "report_form_field_answers", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
+    t.text "answer", size: :long
     t.integer "answer_option_id"
     t.datetime "created_at", precision: nil
     t.integer "form_field_id"
@@ -491,7 +496,7 @@
     t.index ["report_id"], name: "index_report_form_field_answers_on_report_id"
   end
 
-  create_table "reports", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "reports", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.integer "adults_first_time", default: 0
     t.integer "adults_ongoing", default: 0
     t.integer "children_first_time", default: 0
@@ -521,7 +526,7 @@
     t.index ["windows_type_id"], name: "index_reports_on_windows_type_id"
   end
 
-  create_table "resources", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "resources", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.string "agency"
     t.string "author"
     t.datetime "created_at", precision: nil, null: false
@@ -534,7 +539,7 @@
     t.integer "legacy_id"
     t.boolean "male", default: false
     t.integer "ordering"
-    t.text "text", size: :medium
+    t.text "text", size: :long
     t.string "title"
     t.datetime "updated_at", precision: nil, null: false
     t.string "url"
@@ -546,7 +551,7 @@
     t.index ["workshop_id"], name: "index_resources_on_workshop_id"
   end
 
-  create_table "sectorable_items", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "sectorable_items", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.datetime "created_at", precision: nil, null: false
     t.boolean "inactive", default: true
     t.boolean "is_leader", default: false, null: false
@@ -558,15 +563,15 @@
     t.index ["sectorable_type", "sectorable_id"], name: "index_sectorable_items_on_sectorable_type_and_sectorable_id"
   end
 
-  create_table "sectors", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "sectors", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.datetime "created_at", precision: nil, null: false
     t.string "name"
     t.boolean "published", default: false
     t.datetime "updated_at", precision: nil, null: false
   end
 
-  create_table "stories", charset: "utf8mb3", force: :cascade do |t|
-    t.text "body"
+  create_table "stories", charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
+    t.text "body", size: :medium
     t.datetime "created_at", null: false
     t.integer "created_by_id", null: false
     t.string "external_workshop_title"
@@ -593,8 +598,8 @@
     t.index ["workshop_id"], name: "index_stories_on_workshop_id"
   end
 
-  create_table "story_ideas", charset: "utf8mb3", force: :cascade do |t|
-    t.text "body"
+  create_table "story_ideas", charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
+    t.text "body", size: :medium
     t.datetime "created_at", null: false
     t.integer "created_by_id", null: false
     t.string "external_workshop_title"
@@ -614,17 +619,17 @@
     t.index ["workshop_id"], name: "index_story_ideas_on_workshop_id"
   end
 
-  create_table "user_form_form_fields", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "user_form_form_fields", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.datetime "created_at", precision: nil, null: false
     t.integer "form_field_id"
-    t.text "text", size: :medium
+    t.text "text", size: :long
     t.datetime "updated_at", precision: nil, null: false
     t.integer "user_form_id"
     t.index ["form_field_id"], name: "index_user_form_form_fields_on_form_field_id"
     t.index ["user_form_id"], name: "index_user_form_form_fields_on_user_form_id"
   end
 
-  create_table "user_forms", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "user_forms", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.datetime "created_at", precision: nil, null: false
     t.integer "form_id"
     t.datetime "updated_at", precision: nil, null: false
@@ -633,7 +638,7 @@
     t.index ["user_id"], name: "index_user_forms_on_user_id"
   end
 
-  create_table "user_permissions", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "user_permissions", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.datetime "created_at", precision: nil, null: false
     t.integer "permission_id"
     t.datetime "updated_at", precision: nil, null: false
@@ -642,7 +647,7 @@
     t.index ["user_id"], name: "index_user_permissions_on_user_id"
   end
 
-  create_table "users", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "users", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.string "address"
     t.string "address2"
     t.integer "agency_id"
@@ -654,7 +659,7 @@
     t.date "birthday"
     t.string "city"
     t.string "city2"
-    t.text "comment", size: :medium
+    t.text "comment", size: :long
     t.boolean "confirmed", default: true
     t.datetime "created_at", precision: nil
     t.datetime "current_sign_in_at", precision: nil
@@ -669,7 +674,7 @@
     t.string "last_sign_in_ip"
     t.boolean "legacy", default: false
     t.integer "legacy_id"
-    t.text "notes", size: :medium
+    t.text "notes", size: :long
     t.string "phone"
     t.string "phone2"
     t.string "phone3"
@@ -691,7 +696,7 @@
     t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
   end
 
-  create_table "windows_types", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "windows_types", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.datetime "created_at", precision: nil, null: false
     t.integer "legacy_id"
     t.string "name"
@@ -699,7 +704,7 @@
     t.datetime "updated_at", precision: nil, null: false
   end
 
-  create_table "workshop_age_ranges", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "workshop_age_ranges", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.integer "age_range_id"
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
@@ -708,37 +713,37 @@
     t.index ["workshop_id"], name: "index_workshop_age_ranges_on_workshop_id"
   end
 
-  create_table "workshop_ideas", charset: "utf8mb3", force: :cascade do |t|
-    t.text "age_range"
-    t.text "age_range_spanish"
-    t.text "closing"
-    t.text "closing_spanish"
+  create_table "workshop_ideas", charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
+    t.text "age_range", size: :medium
+    t.text "age_range_spanish", size: :medium
+    t.text "closing", size: :medium
+    t.text "closing_spanish", size: :medium
     t.datetime "created_at", null: false
     t.integer "created_by_id", null: false
-    t.text "creation"
-    t.text "creation_spanish"
-    t.text "demonstration"
-    t.text "demonstration_spanish"
-    t.text "description"
-    t.text "description_spanish"
-    t.text "instructions"
-    t.text "instructions_spanish"
-    t.text "introduction"
-    t.text "introduction_spanish"
-    t.text "materials"
-    t.text "materials_spanish"
-    t.text "misc_instructions_spanish"
-    t.text "notes"
-    t.text "notes_spanish"
-    t.text "objective"
-    t.text "objective_spanish"
-    t.text "opening_circle"
-    t.text "opening_circle_spanish"
-    t.text "optional_materials"
-    t.text "optional_materials_spanish"
-    t.text "setup"
-    t.text "setup_spanish"
-    t.text "staff_notes"
+    t.text "creation", size: :medium
+    t.text "creation_spanish", size: :medium
+    t.text "demonstration", size: :medium
+    t.text "demonstration_spanish", size: :medium
+    t.text "description", size: :medium
+    t.text "description_spanish", size: :medium
+    t.text "instructions", size: :medium
+    t.text "instructions_spanish", size: :medium
+    t.text "introduction", size: :medium
+    t.text "introduction_spanish", size: :medium
+    t.text "materials", size: :medium
+    t.text "materials_spanish", size: :medium
+    t.text "misc_instructions_spanish", size: :medium
+    t.text "notes", size: :medium
+    t.text "notes_spanish", size: :medium
+    t.text "objective", size: :medium
+    t.text "objective_spanish", size: :medium
+    t.text "opening_circle", size: :medium
+    t.text "opening_circle_spanish", size: :medium
+    t.text "optional_materials", size: :medium
+    t.text "optional_materials_spanish", size: :medium
+    t.text "setup", size: :medium
+    t.text "setup_spanish", size: :medium
+    t.text "staff_notes", size: :medium
     t.integer "time_closing"
     t.integer "time_creation"
     t.integer "time_demonstration"
@@ -748,40 +753,40 @@
     t.integer "time_opening"
     t.integer "time_opening_circle"
     t.integer "time_warm_up"
-    t.text "timeframe"
-    t.text "timeframe_spanish"
-    t.text "tips"
-    t.text "tips_spanish"
+    t.text "timeframe", size: :medium
+    t.text "timeframe_spanish", size: :medium
+    t.text "tips", size: :medium
+    t.text "tips_spanish", size: :medium
     t.string "title"
     t.datetime "updated_at", null: false
     t.integer "updated_by_id", null: false
-    t.text "visualization"
-    t.text "visualization_spanish"
-    t.text "warm_up"
-    t.text "warm_up_spanish"
+    t.text "visualization", size: :medium
+    t.text "visualization_spanish", size: :medium
+    t.text "warm_up", size: :medium
+    t.text "warm_up_spanish", size: :medium
     t.integer "windows_type_id", null: false
     t.index ["created_by_id"], name: "index_workshop_ideas_on_created_by_id"
     t.index ["updated_by_id"], name: "index_workshop_ideas_on_updated_by_id"
     t.index ["windows_type_id"], name: "index_workshop_ideas_on_windows_type_id"
   end
 
-  create_table "workshop_logs", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
-    t.text "challenges", size: :medium
-    t.text "comments", size: :medium
+  create_table "workshop_logs", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
+    t.text "challenges", size: :long
+    t.text "comments", size: :long
     t.datetime "created_at", precision: nil, null: false
     t.date "date"
-    t.text "differences", size: :medium
+    t.text "differences", size: :long
     t.boolean "is_embodied_art_workshop", default: false
     t.boolean "lead_similar"
     t.integer "num_participants_first_time", default: 0
     t.integer "num_participants_on_going", default: 0
     t.integer "project_id"
-    t.text "questions", size: :medium
+    t.text "questions", size: :long
     t.integer "rating", default: 0
-    t.text "reaction", size: :medium
-    t.text "similarities", size: :medium
-    t.text "successes", size: :medium
-    t.text "suggestions", size: :medium
+    t.text "reaction", size: :long
+    t.text "similarities", size: :long
+    t.text "successes", size: :long
+    t.text "suggestions", size: :long
     t.datetime "updated_at", precision: nil, null: false
     t.integer "user_id"
     t.integer "workshop_id"
@@ -790,7 +795,7 @@
     t.index ["workshop_id"], name: "index_workshop_logs_on_workshop_id"
   end
 
-  create_table "workshop_resources", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "workshop_resources", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.datetime "created_at", precision: nil, null: false
     t.integer "resource_id"
     t.datetime "updated_at", precision: nil, null: false
@@ -799,7 +804,7 @@
     t.index ["workshop_id"], name: "index_workshop_resources_on_workshop_id"
   end
 
-  create_table "workshop_series_memberships", charset: "utf8mb3", force: :cascade do |t|
+  create_table "workshop_series_memberships", charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.datetime "created_at", null: false
     t.string "series_description"
     t.string "series_description_spanish"
@@ -812,8 +817,8 @@
     t.index ["workshop_parent_id", "workshop_child_id"], name: "index_workshop_series_memberships_on_parent_and_child", unique: true
   end
 
-  create_table "workshop_variations", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
-    t.text "code", size: :medium
+  create_table "workshop_variations", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
+    t.text "code", size: :long
     t.datetime "created_at", precision: nil, null: false
     t.integer "created_by_id"
     t.boolean "inactive", default: true
@@ -828,21 +833,21 @@
     t.index ["workshop_id"], name: "index_workshop_variations_on_workshop_id"
   end
 
-  create_table "workshops", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
-    t.text "age_range", size: :medium
-    t.text "age_range_spanish", size: :medium
+  create_table "workshops", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
+    t.text "age_range", size: :long
+    t.text "age_range_spanish", size: :long
     t.string "author_location"
-    t.text "closing", size: :medium
-    t.text "closing_spanish", size: :medium
-    t.datetime "created_at", precision: nil, null: false
-    t.text "creation", size: :medium
-    t.text "creation_spanish", size: :medium
-    t.text "demonstration", size: :medium
-    t.text "demonstration_spanish", size: :medium
-    t.text "description", size: :medium
-    t.text "description_spanish", size: :medium
-    t.text "extra_field"
-    t.text "extra_field_spanish"
+    t.text "closing", size: :long
+    t.text "closing_spanish", size: :long
+    t.datetime "created_at", precision: nil, null: false
+    t.text "creation", size: :long
+    t.text "creation_spanish", size: :long
+    t.text "demonstration", size: :long
+    t.text "demonstration_spanish", size: :long
+    t.text "description", size: :long
+    t.text "description_spanish", size: :long
+    t.text "extra_field", size: :medium
+    t.text "extra_field_spanish", size: :medium
     t.boolean "featured", default: false
     t.string "filemaker_code"
     t.string "full_name"
@@ -851,37 +856,37 @@
     t.integer "header_file_size"
     t.datetime "header_updated_at", precision: nil
     t.boolean "inactive", default: true
-    t.text "instructions", size: :medium
-    t.text "instructions_spanish", size: :medium
-    t.text "introduction", size: :medium
-    t.text "introduction_spanish", size: :medium
+    t.text "instructions", size: :long
+    t.text "instructions_spanish", size: :long
+    t.text "introduction", size: :long
+    t.text "introduction_spanish", size: :long
     t.integer "led_count", default: 0
     t.boolean "legacy", default: false
     t.integer "legacy_id"
-    t.text "materials", size: :medium
-    t.text "materials_spanish", size: :medium
+    t.text "materials", size: :long
+    t.text "materials_spanish", size: :long
     t.string "misc1"
-    t.text "misc1_spanish", size: :medium
+    t.text "misc1_spanish", size: :long
     t.string "misc2"
-    t.text "misc2_spanish", size: :medium
-    t.text "misc_instructions", size: :medium
-    t.text "misc_instructions_spanish", size: :medium
+    t.text "misc2_spanish", size: :long
+    t.text "misc_instructions", size: :long
+    t.text "misc_instructions_spanish", size: :long
     t.integer "month"
-    t.text "notes", size: :medium
-    t.text "notes_spanish", size: :medium
-    t.text "objective", size: :medium
-    t.text "objective_spanish", size: :medium
-    t.text "opening_circle", size: :medium
-    t.text "opening_circle_spanish", size: :medium
-    t.text "optional_materials", size: :medium
-    t.text "optional_materials_spanish", size: :medium
+    t.text "notes", size: :long
+    t.text "notes_spanish", size: :long
+    t.text "objective", size: :long
+    t.text "objective_spanish", size: :long
+    t.text "opening_circle", size: :long
+    t.text "opening_circle_spanish", size: :long
+    t.text "optional_materials", size: :long
+    t.text "optional_materials_spanish", size: :long
     t.string "photo_caption"
-    t.text "project", size: :medium
-    t.text "project_spanish", size: :medium
+    t.text "project", size: :long
+    t.text "project_spanish", size: :long
     t.string "pub_issue"
     t.boolean "searchable", default: false
-    t.text "setup", size: :medium
-    t.text "setup_spanish", size: :medium
+    t.text "setup", size: :long
+    t.text "setup_spanish", size: :long
     t.string "thumbnail_content_type"
     t.string "thumbnail_file_name"
     t.integer "thumbnail_file_size"
@@ -893,18 +898,18 @@
     t.integer "time_opening"
     t.integer "time_opening_circle"
     t.integer "time_warm_up"
-    t.text "timeframe", size: :medium
-    t.text "timeframe_spanish", size: :medium
-    t.text "timestamps", size: :medium
-    t.text "tips", size: :medium
-    t.text "tips_spanish", size: :medium
+    t.text "timeframe", size: :long
+    t.text "timeframe_spanish", size: :long
+    t.text "timestamps", size: :long
+    t.text "tips", size: :long
+    t.text "tips_spanish", size: :long
     t.string "title"
     t.datetime "updated_at", precision: nil, null: false
     t.integer "user_id"
-    t.text "visualization", size: :medium
-    t.text "visualization_spanish", size: :medium
-    t.text "warm_up", size: :medium
-    t.text "warm_up_spanish", size: :medium
+    t.text "visualization", size: :long
+    t.text "visualization_spanish", size: :long
+    t.text "warm_up", size: :long
+    t.text "warm_up_spanish", size: :long
     t.integer "windows_type_id"
     t.bigint "workshop_idea_id"
     t.integer "year"
@@ -920,7 +925,6 @@
     t.index ["year", "month"], name: "index_workshops_on_year_and_month"
   end
 
-  add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"
   add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id"
   add_foreign_key "age_ranges", "windows_types"
   add_foreign_key "banners", "users", column: "created_by_id"
diff --git a/spec/views/facilitators/edit.html.erb_spec.rb b/spec/views/facilitators/edit.html.erb_spec.rb
index cf564ccf5..b6fe9630b 100644
--- a/spec/views/facilitators/edit.html.erb_spec.rb
+++ b/spec/views/facilitators/edit.html.erb_spec.rb
@@ -17,8 +17,8 @@
   end
 
   it "has a form with the facilitator fields" do
-    expect(rendered).to have_field('First name', with: facilitator.user.first_name)
-    expect(rendered).to have_field('Last name', with: facilitator.user.last_name)
+    expect(rendered).to have_field('First name', with: facilitator.first_name)
+    expect(rendered).to have_field('Last name', with: facilitator.last_name)
     expect(rendered).to have_field('Pronouns', with: facilitator.pronouns)
     expect(rendered).to have_checked_field('facilitator_profile_show_pronouns') if facilitator.profile_show_pronouns
   end
diff --git a/spec/views/users/edit.html.erb_spec.rb b/spec/views/users/edit.html.erb_spec.rb
index 6a1186fb9..4fc731ab6 100644
--- a/spec/views/users/edit.html.erb_spec.rb
+++ b/spec/views/users/edit.html.erb_spec.rb
@@ -19,7 +19,7 @@
       end
 
       # Textareas
-      %w[notes].each do |field|
+      %w[comment].each do |field|
         assert_select "textarea[name=?]", "user[#{field}]"
       end
     end
diff --git a/spec/views/users/new.html.erb_spec.rb b/spec/views/users/new.html.erb_spec.rb
index 2ac9e2f2b..e90251a11 100644
--- a/spec/views/users/new.html.erb_spec.rb
+++ b/spec/views/users/new.html.erb_spec.rb
@@ -21,7 +21,7 @@
 
       assert_select "input[name=?]", "user[email]"
 
-      assert_select "textarea[name=?]", "user[notes]"
+      assert_select "textarea[name=?]", "user[comment]"
 
       assert_select "input[name=?]", "user[inactive]"