diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 06d8630b5e..0a2ed2d147 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,4 +1,8 @@
+blank_issues_enabled: false
 contact_links:
+  - name: Ask a question
+    url: https://github.com/avo-hq/avo/discussions
+    about: Ask questions and discuss with other community members
   - name: Priority Support
     url: https://avohq.io/support
     about: Get fast support from the authors of Avo
diff --git a/.github/workflows/i18n-tests.yml b/.github/workflows/i18n-tests.yml
index 4d7fd49842..58fe52afcd 100644
--- a/.github/workflows/i18n-tests.yml
+++ b/.github/workflows/i18n-tests.yml
@@ -106,12 +106,12 @@ jobs:
       id: run_tests
       run: bundle exec rspec spec/system/i18n_spec.rb
 
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: coverage_system_${{ matrix.rails }}_ruby_${{ matrix.ruby }}
         path: coverage/.resultset.json
 
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       if: always() && steps.run_tests.outcome == 'failure'
       with:
         name: rspec_failed_screenshots_rails_${{ matrix.rails }}_ruby_${{ matrix.ruby }}
diff --git a/.github/workflows/system-tests.yml b/.github/workflows/system-tests.yml
index 66a06de509..91193e02ab 100644
--- a/.github/workflows/system-tests.yml
+++ b/.github/workflows/system-tests.yml
@@ -111,12 +111,12 @@ jobs:
       id: run_tests
       run: bundle exec rspec spec/system/ --tag=~i18n
 
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: coverage_system_${{ matrix.rails }}_ruby_${{ matrix.ruby }}
         path: coverage/.resultset.json
 
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       if: always() && steps.run_tests.outcome == 'failure'
       with:
         name: rspec_failed_screenshots_rails_${{ matrix.rails }}_ruby_${{ matrix.ruby }}
diff --git a/.gitignore b/.gitignore
index 8e5fdcceb7..72c37ca3c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -77,3 +77,4 @@ brakeman_results.html
 
 .env
 .env.test
+*~
diff --git a/Appraisals b/Appraisals
index d68c9d12ae..b8ba507b1e 100644
--- a/Appraisals
+++ b/Appraisals
@@ -9,6 +9,12 @@
       gem "activestorage", "~> #{rails_version}"
       gem "activestorage"
       gem "acts-as-taggable-on"
+
+      if rails_version == "6.1"
+        # Fix `<module:LoggerThreadSafeLevel>': uninitialized constant ActiveSupport::LoggerThreadSafeLevel::Logger (NameError)
+        # https://stackoverflow.com/questions/79360526/uninitialized-constant-activesupportloggerthreadsafelevellogger-nameerror
+        gem "concurrent-ruby", "1.3.4"
+      end
     end
   end
 end
diff --git a/Gemfile b/Gemfile
index 814760193b..3d6c2b2c29 100644
--- a/Gemfile
+++ b/Gemfile
@@ -175,7 +175,7 @@ gem "image_processing", "~> 1.12"
 gem "prefixed_ids"
 
 gem "mapkick-rb", "~> 0.1.4"
-
+gem "mapkick-static"
 gem "pluggy", path: "./pluggy"
 
 gem "hashid-rails", "~> 1.4", ">= 1.4.1"
diff --git a/Gemfile.lock b/Gemfile.lock
index e2f1983218..a3086f7bab 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (3.16.1)
+    avo (3.17.6)
       actionview (>= 6.1)
       active_link_to
       activerecord (>= 6.1)
@@ -107,10 +107,12 @@ GEM
     acts_as_list (1.2.4)
       activerecord (>= 6.1)
       activesupport (>= 6.1)
-    actual_db_schema (0.8.0)
+    actual_db_schema (0.8.2)
       activerecord
       activesupport
+      ast
       csv
+      parser
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     amazing_print (1.7.2)
@@ -126,20 +128,21 @@ GEM
       money-rails (~> 1.12)
     avo-record_link_field (0.0.2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.1033.0)
-    aws-sdk-core (3.214.1)
+    aws-partitions (1.1050.0)
+    aws-sdk-core (3.218.1)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
+      base64
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.96.0)
-      aws-sdk-core (~> 3, >= 3.210.0)
+    aws-sdk-kms (1.98.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.177.0)
-      aws-sdk-core (~> 3, >= 3.210.0)
+    aws-sdk-s3 (1.180.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.10.1)
+    aws-sigv4 (1.11.0)
       aws-eventstream (~> 1, >= 1.0.2)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
@@ -173,14 +176,14 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    chartkick (5.1.2)
+    chartkick (5.1.3)
     childprocess (5.1.0)
       logger (~> 1.5)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
     concurrent-ruby (1.3.5)
     connection_pool (2.5.0)
-    countries (7.1.0)
+    countries (7.1.1)
       unaccent (~> 0.3)
     crack (1.0.0)
       bigdecimal
@@ -221,7 +224,7 @@ GEM
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    diff-lcs (1.5.1)
+    diff-lcs (1.6.0)
     docile (1.4.1)
     dotenv (3.1.7)
     dotenv-rails (3.1.7)
@@ -250,17 +253,16 @@ GEM
       dry-logic (>= 1.4, < 2)
       dry-types (>= 1.7, < 2)
       zeitwerk (~> 2.6)
-    dry-types (1.8.0)
+    dry-types (1.8.2)
       bigdecimal (~> 3.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 1.0)
       dry-inflector (~> 1.0)
       dry-logic (~> 1.4)
       zeitwerk (~> 2.6)
-    e2mmap (0.1.0)
     erb-formatter (0.7.3)
       syntax_tree (~> 6.0)
-    erb_lint (0.8.0)
+    erb_lint (0.9.0)
       activesupport
       better_html (>= 2.0.1)
       parser (>= 2.7.1.4)
@@ -269,8 +271,8 @@ GEM
       smart_properties
     erubi (1.13.1)
     event_stream_parser (1.0.0)
-    factory_bot (6.5.0)
-      activesupport (>= 5.0.0)
+    factory_bot (6.5.1)
+      activesupport (>= 6.1.0)
     factory_bot_rails (6.4.4)
       factory_bot (~> 6.5)
       railties (>= 5.0.0)
@@ -328,7 +330,7 @@ GEM
       listen (>= 3.0.0)
       railties (>= 6.0.0)
     htmlbeautifier (1.4.3)
-    i18n (1.14.6)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     i18n-tasks (1.0.14)
       activesupport (>= 4.0.2)
@@ -341,14 +343,15 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       terminal-table (>= 1.5.1)
     ice_nine (0.11.2)
-    image_processing (1.13.0)
-      mini_magick (>= 4.9.5, < 5)
+    image_processing (1.14.0)
+      mini_magick (>= 4.9.5, < 6)
       ruby-vips (>= 2.0.17, < 3)
     inline_svg (1.10.0)
       activesupport (>= 3.0)
       nokogiri (>= 1.6)
     io-console (0.8.0)
-    irb (1.14.3)
+    irb (1.15.1)
+      pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     iso (0.4.0)
@@ -357,15 +360,16 @@ GEM
     jmespath (1.6.2)
     jsbundling-rails (1.3.1)
       railties (>= 6.0.0)
-    json (2.9.1)
+    json (2.10.1)
     kramdown (2.5.1)
       rexml (>= 3.3.9)
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    language_server-protocol (3.17.0.3)
-    launchy (3.0.1)
+    language_server-protocol (3.17.0.4)
+    launchy (3.1.0)
       addressable (~> 2.8)
       childprocess (~> 5.0)
+      logger (~> 1.6)
     lint_roller (1.1.0)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
@@ -380,6 +384,7 @@ GEM
       net-pop
       net-smtp
     mapkick-rb (0.1.5)
+    mapkick-static (0.1.1)
     marcel (1.0.4)
     matrix (0.4.2)
     memory_profiler (1.1.0)
@@ -387,7 +392,9 @@ GEM
       actionpack (>= 6.0.0, < 8.1)
     method_source (1.1.0)
     mini_histogram (0.3.1)
-    mini_magick (4.13.2)
+    mini_magick (5.1.2)
+      benchmark
+      logger
     mini_mime (1.1.5)
     minitest (5.25.4)
     monetize (1.13.0)
@@ -399,46 +406,48 @@ GEM
       monetize (~> 1.9)
       money (~> 6.13)
       railties (>= 3.0)
-    msgpack (1.7.5)
+    msgpack (1.8.0)
     multipart-post (2.4.1)
     net-http (0.6.0)
       uri
-    net-imap (0.5.5)
+    net-imap (0.5.6)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.5.0)
+    net-smtp (0.5.1)
       net-protocol
     nio4r (2.7.4)
-    nokogiri (1.18.1-arm64-darwin)
+    nokogiri (1.18.2-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.1-x86_64-linux-gnu)
+    nokogiri (1.18.2-x86_64-linux-gnu)
       racc (~> 1.4)
+    observer (0.1.2)
     orm_adapter (0.5.0)
+    ostruct (0.6.1)
     pagy (9.3.3)
     parallel (1.26.3)
-    parser (3.3.6.0)
+    parser (3.3.7.1)
       ast (~> 2.4.1)
       racc
     path_expander (1.1.3)
     pg (1.5.9)
+    pp (0.6.2)
+      prettyprint
     prefixed_ids (1.8.1)
       hashids (>= 1.0.0, < 2.0.0)
       rails (>= 6.0.0)
     prettier_print (1.2.1)
+    prettyprint (0.2.0)
     prop_initializer (0.2.0)
       zeitwerk (>= 2.6.18)
-    psych (5.2.3)
-      date
-      stringio
     public_suffix (6.0.1)
-    puma (6.5.0)
+    puma (6.6.0)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (3.1.8)
+    rack (3.1.10)
     rack-session (2.1.0)
       base64 (>= 0.1.0)
       rack (>= 3.0.0)
@@ -484,22 +493,23 @@ GEM
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
     rake (13.2.1)
-    ransack (4.2.1)
+    ransack (4.3.0)
       activerecord (>= 6.1.5)
       activesupport (>= 6.1.5)
       i18n
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rbs (2.8.4)
+    rbs (3.8.1)
+      logger
     rdoc (6.11.0)
-      psych (>= 4.0.0)
     redis (5.3.0)
       redis-client (>= 0.22.0)
-    redis-client (0.23.0)
+    redis-client (0.23.2)
       connection_pool
-    reek (6.3.0)
+    reek (6.4.0)
       dry-schema (~> 1.13.0)
+      logger (~> 1.6)
       parser (~> 3.3.0)
       rainbow (>= 2.0, < 4.0)
       rexml (~> 3.1)
@@ -509,11 +519,11 @@ GEM
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
-    reverse_markdown (2.1.1)
+    reverse_markdown (3.0.0)
       nokogiri
     rexml (3.4.0)
     ripper-tags (1.0.2)
-    rspec-core (3.13.2)
+    rspec-core (3.13.3)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -532,30 +542,30 @@ GEM
     rspec-retry (0.6.2)
       rspec-core (> 3.3)
     rspec-support (3.13.2)
-    rubocop (1.69.2)
+    rubocop (1.71.2)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.36.2, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.37.0)
+    rubocop-ast (1.38.0)
       parser (>= 3.3.1.0)
     rubocop-performance (1.23.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-shopify (2.15.1)
       rubocop (~> 1.51)
-    ruby-openai (7.3.1)
+    ruby-openai (7.4.0)
       event_stream_parser (>= 0.3.0, < 2.0.0)
       faraday (>= 1)
       faraday-multipart (>= 1)
     ruby-progressbar (1.13.0)
     ruby-statistics (3.0.2)
-    ruby-vips (2.2.2)
+    ruby-vips (2.2.3)
       ffi (~> 1.12)
       logger
     ruby_parser (3.21.1)
@@ -586,18 +596,20 @@ GEM
     simplecov-lcov (0.8.0)
     simplecov_json_formatter (0.1.4)
     smart_properties (1.17.0)
-    solargraph (0.50.0)
+    solargraph (0.51.2)
       backport (~> 1.2)
       benchmark
       bundler (~> 2.0)
       diff-lcs (~> 1.4)
-      e2mmap
-      jaro_winkler (~> 1.5)
+      jaro_winkler (~> 1.6)
       kramdown (~> 2.3)
       kramdown-parser-gfm (~> 1.1)
+      logger (~> 1.6)
+      observer (~> 0.1)
+      ostruct (~> 0.6)
       parser (~> 3.0)
-      rbs (~> 2.0)
-      reverse_markdown (~> 2.0)
+      rbs (~> 3.0)
+      reverse_markdown (>= 2.0, < 4)
       rubocop (~> 1.38)
       thor (~> 1.0)
       tilt (~> 2.0)
@@ -615,10 +627,10 @@ GEM
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       sprockets (>= 3.0.0)
-    standard (1.43.0)
+    standard (1.45.0)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)
-      rubocop (~> 1.69.1)
+      rubocop (~> 1.71.0)
       standard-custom (~> 1.0.0)
       standard-performance (~> 1.6)
     standard-custom (1.0.2)
@@ -627,15 +639,14 @@ GEM
     standard-performance (1.6.0)
       lint_roller (~> 1.1)
       rubocop-performance (~> 1.23.0)
-    stringio (3.1.2)
     syntax_tree (6.2.0)
       prettier_print (>= 1.2.0)
-    terminal-table (3.0.2)
-      unicode-display_width (>= 1.1.1, < 3)
+    terminal-table (4.0.0)
+      unicode-display_width (>= 1.1.1, < 4)
     test-prof (1.4.4)
     thor (1.3.2)
     thread_safe (0.3.6)
-    tilt (2.5.0)
+    tilt (2.6.0)
     timeout (0.4.3)
     tty-which (0.5.0)
     turbo-rails (2.0.11)
@@ -646,7 +657,9 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unaccent (0.4.0)
-    unicode-display_width (2.6.0)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
     uri (1.0.2)
     useragent (0.16.11)
     view_component (3.21.0)
@@ -664,7 +677,7 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webmock (3.24.0)
+    webmock (3.25.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -680,6 +693,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-23
+  arm64-darwin-24
   x86_64-linux
 
 DEPENDENCIES
@@ -730,6 +744,7 @@ DEPENDENCIES
   launchy
   listen (>= 3.5.1)
   mapkick-rb (~> 0.1.4)
+  mapkick-static
   meta-tags
   money-rails (~> 1.12)
   net-smtp
diff --git a/app/assets/stylesheets/avo.base.css b/app/assets/stylesheets/avo.base.css
index 4ed8088797..956131a321 100644
--- a/app/assets/stylesheets/avo.base.css
+++ b/app/assets/stylesheets/avo.base.css
@@ -93,6 +93,26 @@ dialog#turbo-confirm {
   @apply bg-transparent;
 }
 
+dl {
+  @apply text-sm;
+
+  dt {
+    @apply font-bold inline-block mt-1;
+  }
+
+  dd {
+    @apply inline-block ml-0;
+  }
+}
+
+/* TODO: make content like tailwindcss */
+.floating-row-controls {
+  &:before {
+    content: "";
+    @apply absolute z-10 inset-auto left-0 top-0 mt-0 -translate-x-full w-3 h-full bg-gradient-to-l from-white to-transparent group-hover:from-gray-50;
+  }
+}
+
 .shift-pressed {
   & .highlighted-row {
     @apply !bg-neutral-200;
diff --git a/app/assets/stylesheets/css/fields/trix.css b/app/assets/stylesheets/css/fields/trix.css
index 53c2046296..5a4044408f 100644
--- a/app/assets/stylesheets/css/fields/trix.css
+++ b/app/assets/stylesheets/css/fields/trix.css
@@ -35,3 +35,10 @@ trix-toolbar {
     @apply ml-0;
   }
 }
+
+/* Hack to remove border from trix when rendered from ActionText */
+.trix-content {
+  & .trix-content {
+    border: none;
+  }
+}
diff --git a/app/assets/svgs/avo/square-kanban.svg b/app/assets/svgs/avo/square-kanban.svg
new file mode 100644
index 0000000000..dcab361ce0
--- /dev/null
+++ b/app/assets/svgs/avo/square-kanban.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-square-kanban"><rect width="18" height="18" x="3" y="3" rx="2"/><path d="M8 7v7"/><path d="M12 7v4"/><path d="M16 7v9"/></svg>
diff --git a/app/components/avo/actions_component.rb b/app/components/avo/actions_component.rb
index 2e809a809c..9acb59f524 100644
--- a/app/components/avo/actions_component.rb
+++ b/app/components/avo/actions_component.rb
@@ -102,7 +102,8 @@ def action_data_attributes(action)
       disabled: action.disabled?,
       turbo_prefetch: false,
       enabled_classes: "text-black",
-      disabled_classes: "text-gray-500"
+      disabled_classes: "text-gray-500",
+      resource_name: action.resource.model_key
     }
   end
 
diff --git a/app/components/avo/asset_manager/javascript_component.html.erb b/app/components/avo/asset_manager/javascript_component.html.erb
index 92ab565571..973877b3f3 100644
--- a/app/components/avo/asset_manager/javascript_component.html.erb
+++ b/app/components/avo/asset_manager/javascript_component.html.erb
@@ -1,3 +1,12 @@
 <% javascripts.each do |path| %>
   <%= javascript_include_tag path, "data-turbo-track": "reload", defer: true %>
 <% end %>
+
+<%# Collect all the custom StimulusJS controllers from plugins. %>
+<%= javascript_tag nonce: true do %>
+  Avo.configuration.stimulus_controllers = <%== Avo.asset_manager.stimulus_controllers.to_a.to_json %>
+<% end %>
+
+<%# This is the last script to run so it can register custom StimulusJS controllers from plugins. %>
+<% path = Avo::PACKED ? '/avo-assets/late-registration' : 'late-registration' %>
+<%= javascript_include_tag path, "data-turbo-track": "reload", defer: true %>
diff --git a/app/components/avo/asset_manager/javascript_component.rb b/app/components/avo/asset_manager/javascript_component.rb
index 3de1aa8ee9..b08e80da4a 100644
--- a/app/components/avo/asset_manager/javascript_component.rb
+++ b/app/components/avo/asset_manager/javascript_component.rb
@@ -4,4 +4,5 @@ class Avo::AssetManager::JavascriptComponent < Avo::BaseComponent
   prop :asset_manager
 
   delegate :javascripts, to: :@asset_manager
+  delegate :stimulus_controllers, to: :@asset_manager
 end
diff --git a/app/components/avo/base_component.rb b/app/components/avo/base_component.rb
index aadcbbaf5c..72dfe5ba75 100644
--- a/app/components/avo/base_component.rb
+++ b/app/components/avo/base_component.rb
@@ -5,10 +5,17 @@ class Avo::BaseComponent < ViewComponent::Base
   include Turbo::FramesHelper
   include Avo::Concerns::FindAssociationField
 
+  delegate :e, to: :helpers
+  delegate :d, to: :helpers
+  delegate :main_app, to: :helpers
+  delegate :avo, to: :helpers
+
   def has_with_trial(ability)
     Avo.license.has_with_trial(ability)
   end
 
+  def component_name = self.class.name.to_s.underscore
+
   private
 
   # Use the @parent_resource to fetch the field using the @reflection name.
diff --git a/app/components/avo/button_component.rb b/app/components/avo/button_component.rb
index 3c913313f7..7613ed1476 100644
--- a/app/components/avo/button_component.rb
+++ b/app/components/avo/button_component.rb
@@ -1,5 +1,10 @@
 # frozen_string_literal: true
 
+# A button/link can have the following settings:
+# style: primary/outline/text/icon
+# size: :xs :sm, :md, :lg, :xl
+# color: :gray, :red, :green, :blue, or any other tailwind color
+# icon: "heroicons/outline/paperclip" as specified in the docs (https://docs.avohq.io/3.0/icons.html)
 class Avo::ButtonComponent < Avo::BaseComponent
   prop :path, kind: :positional
   prop :size, default: :md
diff --git a/app/components/avo/fields/area_field/edit_component.html.erb b/app/components/avo/fields/area_field/edit_component.html.erb
index 28ffcb87e8..5b410aa6d1 100644
--- a/app/components/avo/fields/area_field/edit_component.html.erb
+++ b/app/components/avo/fields/area_field/edit_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= @form.text_field field.id,
     value: field.value.to_s,
     class: classes("w-full"),
diff --git a/app/components/avo/fields/area_field/show_component.html.erb b/app/components/avo/fields/area_field/show_component.html.erb
index f4377507c7..0466bf9de5 100644
--- a/app/components/avo/fields/area_field/show_component.html.erb
+++ b/app/components/avo/fields/area_field/show_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <% if field.value.present? %>
     <%= area_map field.map_data, **field.mapkick_options %>
   <% else %>
diff --git a/app/components/avo/fields/badge_field/index_component.html.erb b/app/components/avo/fields/badge_field/index_component.html.erb
index 4fdf9e07b1..6d137ecb98 100644
--- a/app/components/avo/fields/badge_field/index_component.html.erb
+++ b/app/components/avo/fields/badge_field/index_component.html.erb
@@ -1,3 +1,3 @@
-<%= index_field_wrapper **field_wrapper_args, flush: true do %>
+<%= index_field_wrapper(**field_wrapper_args, flush: true) do %>
   <%= render Avo::Fields::Common::BadgeViewerComponent.new value: @field.value, options: @field.options %>
 <% end %>
diff --git a/app/components/avo/fields/badge_field/show_component.html.erb b/app/components/avo/fields/badge_field/show_component.html.erb
index 461a7b8bbe..b18ed6fded 100644
--- a/app/components/avo/fields/badge_field/show_component.html.erb
+++ b/app/components/avo/fields/badge_field/show_component.html.erb
@@ -1,3 +1,3 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= render Avo::Fields::Common::BadgeViewerComponent.new value: @field.value, options: @field.options %>
 <% end %>
diff --git a/app/components/avo/fields/belongs_to_field/edit_component.html.erb b/app/components/avo/fields/belongs_to_field/edit_component.html.erb
index b38be635bd..5d7a30e362 100644
--- a/app/components/avo/fields/belongs_to_field/edit_component.html.erb
+++ b/app/components/avo/fields/belongs_to_field/edit_component.html.erb
@@ -5,7 +5,7 @@
       data-association="<%= @field.id %>"
       data-association-class="<%= @field&.target_resource&.model_class || nil %>"
     >
-    <%= field_wrapper **field_wrapper_args, label_for: @field.polymorphic_form_field_label, help: @field.polymorphic_help || '' do %>
+    <%= field_wrapper(**field_wrapper_args, label_for: @field.polymorphic_form_field_label, help: @field.polymorphic_help || '') do %>
       <%= @form.select @field.type_input_foreign_key, @field.types.map { |type| [Avo.resource_manager.get_resource_by_model_class(type.to_s).name, type.to_s] },
       {
         value: @field.value,
@@ -32,7 +32,7 @@
     <% @field.types.each do |type| %>
       <template data-belongs-to-field-target="type" data-type="<%= type %>">
         <div data-polymorphic-type="<%= type %>">
-          <%= field_wrapper **field_wrapper_args.merge!(data: reload_data), label: Avo.resource_manager.get_resource_by_model_class(type.to_s).name do %>
+          <%= field_wrapper(**field_wrapper_args.merge!(data: reload_data), label: Avo.resource_manager.get_resource_by_model_class(type.to_s).name) do %>
             <% if @field.is_searchable? %>
               <%= render Avo::Pro::SearchableAssociations::AutocompleteComponent.new form: @form,
                 disabled: disabled,
@@ -88,7 +88,7 @@
     <% end %>
   </div>
 <% else %>
-  <%= field_wrapper **field_wrapper_args.merge!(data: reload_data) do %>
+  <%= field_wrapper(**field_wrapper_args.merge!(data: reload_data)) do %>
     <% if @field.is_searchable? %>
       <%= render Avo::Pro::SearchableAssociations::AutocompleteComponent.new form: @form,
         field: @field,
diff --git a/app/components/avo/fields/belongs_to_field/index_component.html.erb b/app/components/avo/fields/belongs_to_field/index_component.html.erb
index 7431df8fd2..78a3e40e8b 100644
--- a/app/components/avo/fields/belongs_to_field/index_component.html.erb
+++ b/app/components/avo/fields/belongs_to_field/index_component.html.erb
@@ -1,4 +1,4 @@
-<%= index_field_wrapper **field_wrapper_args do %>
+<%= index_field_wrapper(**field_wrapper_args) do %>
   <%= link_to @field.label, helpers.resource_view_path(
     record: @field.index_link_to_record,
     resource: @field.index_link_to_resource
diff --git a/app/components/avo/fields/belongs_to_field/show_component.html.erb b/app/components/avo/fields/belongs_to_field/show_component.html.erb
index f87c7a152b..d501f44a9e 100644
--- a/app/components/avo/fields/belongs_to_field/show_component.html.erb
+++ b/app/components/avo/fields/belongs_to_field/show_component.html.erb
@@ -1,3 +1,3 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= link_to @field.label, resource_view_path, data: {turbo_frame: @field.target} %>
 <% end %>
diff --git a/app/components/avo/fields/boolean_field/edit_component.html.erb b/app/components/avo/fields/boolean_field/edit_component.html.erb
index fd3327649a..b05e41f07a 100644
--- a/app/components/avo/fields/boolean_field/edit_component.html.erb
+++ b/app/components/avo/fields/boolean_field/edit_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <div class="h-8 flex items-center">
     <%= @form.check_box @field.id,
       value: @field.value,
diff --git a/app/components/avo/fields/boolean_field/index_component.html.erb b/app/components/avo/fields/boolean_field/index_component.html.erb
index fb7a33c854..900de4f670 100644
--- a/app/components/avo/fields/boolean_field/index_component.html.erb
+++ b/app/components/avo/fields/boolean_field/index_component.html.erb
@@ -1,3 +1,3 @@
-<%= index_field_wrapper **field_wrapper_args, flush: true do %>
+<%= index_field_wrapper(**field_wrapper_args, flush: true) do %>
   <%= render Avo::Fields::Common::BooleanCheckComponent.new checked: @field.value %>
 <% end %>
diff --git a/app/components/avo/fields/boolean_field/show_component.html.erb b/app/components/avo/fields/boolean_field/show_component.html.erb
index ffee935ed8..9392e97349 100644
--- a/app/components/avo/fields/boolean_field/show_component.html.erb
+++ b/app/components/avo/fields/boolean_field/show_component.html.erb
@@ -1,3 +1,3 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= render Avo::Fields::Common::BooleanCheckComponent.new checked: @field.value %>
 <% end %>
diff --git a/app/components/avo/fields/boolean_group_field/edit_component.html.erb b/app/components/avo/fields/boolean_group_field/edit_component.html.erb
index 7b0991b0ac..65d8b45466 100644
--- a/app/components/avo/fields/boolean_group_field/edit_component.html.erb
+++ b/app/components/avo/fields/boolean_group_field/edit_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <div class="flex items-center">
     <div class="space-y-2">
       <% @field.options.each do |id, label| %>
diff --git a/app/components/avo/fields/boolean_group_field/index_component.html.erb b/app/components/avo/fields/boolean_group_field/index_component.html.erb
index 403f405816..cf2583e8ab 100644
--- a/app/components/avo/fields/boolean_group_field/index_component.html.erb
+++ b/app/components/avo/fields/boolean_group_field/index_component.html.erb
@@ -1,3 +1,3 @@
-<%= index_field_wrapper **field_wrapper_args, dash_if_blank: false do %>
+<%= index_field_wrapper(**field_wrapper_args, dash_if_blank: false) do %>
   <%= render Avo::Fields::Common::BooleanGroupComponent.new options: @field.options, value: @field.value %>
 <% end %>
diff --git a/app/components/avo/fields/boolean_group_field/show_component.html.erb b/app/components/avo/fields/boolean_group_field/show_component.html.erb
index 2c622dd26d..72fd75fde7 100644
--- a/app/components/avo/fields/boolean_group_field/show_component.html.erb
+++ b/app/components/avo/fields/boolean_group_field/show_component.html.erb
@@ -1,3 +1,3 @@
-<%= field_wrapper **field_wrapper_args, dash_if_blank: false do %>
+<%= field_wrapper(**field_wrapper_args, dash_if_blank: false) do %>
   <%= render Avo::Fields::Common::BooleanGroupComponent.new options: @field.options, value: @field.value %>
 <% end %>
diff --git a/app/components/avo/fields/code_field/edit_component.html.erb b/app/components/avo/fields/code_field/edit_component.html.erb
index fc424d7523..76fce9ef2d 100644
--- a/app/components/avo/fields/code_field/edit_component.html.erb
+++ b/app/components/avo/fields/code_field/edit_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args, full_width: true do %>
+<%= field_wrapper(**field_wrapper_args, full_width: true) do %>
   <div data-controller="code-field">
     <%= @form.text_area @field.id,
       value: @field.value,
diff --git a/app/components/avo/fields/code_field/show_component.html.erb b/app/components/avo/fields/code_field/show_component.html.erb
index 7f3349eea0..6b3b75bad4 100644
--- a/app/components/avo/fields/code_field/show_component.html.erb
+++ b/app/components/avo/fields/code_field/show_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args, full_width: true do %>
+<%= field_wrapper(**field_wrapper_args, full_width: true) do %>
   <div data-controller="code-field" style="--height: <%= @field.height %>">
     <%= text_area_tag @field.id, @field.value,
       class: helpers.input_classes('w-full'),
diff --git a/app/components/avo/fields/common/heading_component.rb b/app/components/avo/fields/common/heading_component.rb
index 74d5270db2..d85c34afd7 100644
--- a/app/components/avo/fields/common/heading_component.rb
+++ b/app/components/avo/fields/common/heading_component.rb
@@ -8,7 +8,7 @@ class Avo::Fields::Common::HeadingComponent < Avo::BaseComponent
   def after_initialize
     @view = @field.resource.view
     @classes = "flex items-start py-1 leading-tight bg-gray-100 text-gray-500 text-xs #{@field.get_html(:classes, view: @view, element: :wrapper)}"
-    @data = stimulus_data_attributes
+    @data = {**stimulus_data_attributes, **@field.get_html(:data, view: @view, element: :wrapper)}
     add_stimulus_attributes_for(@field.resource, @data)
   end
 end
diff --git a/app/components/avo/fields/country_field/edit_component.html.erb b/app/components/avo/fields/country_field/edit_component.html.erb
index eceb336c1b..dea2562df6 100644
--- a/app/components/avo/fields/country_field/edit_component.html.erb
+++ b/app/components/avo/fields/country_field/edit_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= @form.select @field.id, @field.select_options, {
       value: @field.value,
       selected: @field.value,
diff --git a/app/components/avo/fields/country_field/index_component.html.erb b/app/components/avo/fields/country_field/index_component.html.erb
index 9e5641b1cf..26feb80917 100644
--- a/app/components/avo/fields/country_field/index_component.html.erb
+++ b/app/components/avo/fields/country_field/index_component.html.erb
@@ -1,4 +1,4 @@
-<%= index_field_wrapper **field_wrapper_args do %>
+<%= index_field_wrapper(**field_wrapper_args) do %>
   <% if @field.display_code %>
     <%= @field.value %>
   <% else %>
diff --git a/app/components/avo/fields/country_field/show_component.html.erb b/app/components/avo/fields/country_field/show_component.html.erb
index 1876393e9d..221e8b0500 100644
--- a/app/components/avo/fields/country_field/show_component.html.erb
+++ b/app/components/avo/fields/country_field/show_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <% if @field.display_code %>
     <%= @field.value %>
   <% else %>
diff --git a/app/components/avo/fields/date_field/edit_component.html.erb b/app/components/avo/fields/date_field/edit_component.html.erb
index 9b531b5ed2..94250ed584 100644
--- a/app/components/avo/fields/date_field/edit_component.html.erb
+++ b/app/components/avo/fields/date_field/edit_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= content_tag :div, data: {
       controller: "date-field",
       date_field_view_value: @view,
diff --git a/app/components/avo/fields/date_field/index_component.html.erb b/app/components/avo/fields/date_field/index_component.html.erb
index cc1d1fa297..5ad0b84b21 100644
--- a/app/components/avo/fields/date_field/index_component.html.erb
+++ b/app/components/avo/fields/date_field/index_component.html.erb
@@ -1,4 +1,4 @@
-<%= index_field_wrapper **field_wrapper_args do %>
+<%= index_field_wrapper(**field_wrapper_args) do %>
    <%= content_tag :div, data: {
     controller: "date-field",
     date_field_view_value: @view,
diff --git a/app/components/avo/fields/date_field/show_component.html.erb b/app/components/avo/fields/date_field/show_component.html.erb
index 5816df1dd6..c07306d57e 100644
--- a/app/components/avo/fields/date_field/show_component.html.erb
+++ b/app/components/avo/fields/date_field/show_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= content_tag :div, data: {
     controller: "date-field",
     date_field_view_value: @view,
diff --git a/app/components/avo/fields/date_time_field/edit_component.html.erb b/app/components/avo/fields/date_time_field/edit_component.html.erb
index d255673ded..283c2da58a 100644
--- a/app/components/avo/fields/date_time_field/edit_component.html.erb
+++ b/app/components/avo/fields/date_time_field/edit_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= content_tag :div, class: "flex relative", data: {
       controller: "date-field",
       date_field_view_value: @view,
diff --git a/app/components/avo/fields/date_time_field/index_component.html.erb b/app/components/avo/fields/date_time_field/index_component.html.erb
index 05aea8b09b..9549c3dd7f 100644
--- a/app/components/avo/fields/date_time_field/index_component.html.erb
+++ b/app/components/avo/fields/date_time_field/index_component.html.erb
@@ -1,4 +1,4 @@
-<%= index_field_wrapper **field_wrapper_args do %>
+<%= index_field_wrapper(**field_wrapper_args) do %>
    <%= content_tag :div, data: {
     controller: "date-field",
     date_field_view_value: @view,
diff --git a/app/components/avo/fields/date_time_field/show_component.html.erb b/app/components/avo/fields/date_time_field/show_component.html.erb
index 9a64a75ffc..806520d532 100644
--- a/app/components/avo/fields/date_time_field/show_component.html.erb
+++ b/app/components/avo/fields/date_time_field/show_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= content_tag :div, data: {
     controller: "date-field",
     date_field_view_value: @view,
diff --git a/app/components/avo/fields/markdown_field/edit_component.html.erb b/app/components/avo/fields/easy_mde_field/edit_component.html.erb
similarity index 88%
rename from app/components/avo/fields/markdown_field/edit_component.html.erb
rename to app/components/avo/fields/easy_mde_field/edit_component.html.erb
index 51724f4e2d..7ed3b7f7ac 100644
--- a/app/components/avo/fields/markdown_field/edit_component.html.erb
+++ b/app/components/avo/fields/easy_mde_field/edit_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args, full_width: true do %>
+<%= field_wrapper(**field_wrapper_args, full_width: true) do %>
   <div data-controller="easy-mde">
     <%= @form.text_area @field.id,
       value: @field.value,
diff --git a/app/components/avo/fields/easy_mde_field/edit_component.rb b/app/components/avo/fields/easy_mde_field/edit_component.rb
new file mode 100644
index 0000000000..80d30d2ae3
--- /dev/null
+++ b/app/components/avo/fields/easy_mde_field/edit_component.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class Avo::Fields::EasyMdeField::EditComponent < Avo::Fields::EditComponent
+end
diff --git a/app/components/avo/fields/markdown_field/show_component.html.erb b/app/components/avo/fields/easy_mde_field/show_component.html.erb
similarity index 84%
rename from app/components/avo/fields/markdown_field/show_component.html.erb
rename to app/components/avo/fields/easy_mde_field/show_component.html.erb
index 822045e6f8..4aa97528fc 100644
--- a/app/components/avo/fields/markdown_field/show_component.html.erb
+++ b/app/components/avo/fields/easy_mde_field/show_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args, full_width: true do %>
+<%= field_wrapper(**field_wrapper_args, full_width: true) do %>
   <div data-controller="easy-mde">
     <%= text_area_tag @field.id, @field.value,
       class: helpers.input_classes('w-full js-has-easy-mde-editor'),
diff --git a/app/components/avo/fields/easy_mde_field/show_component.rb b/app/components/avo/fields/easy_mde_field/show_component.rb
new file mode 100644
index 0000000000..78b07fcc45
--- /dev/null
+++ b/app/components/avo/fields/easy_mde_field/show_component.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class Avo::Fields::EasyMdeField::ShowComponent < Avo::Fields::ShowComponent
+end
diff --git a/app/components/avo/fields/external_image_field/edit_component.html.erb b/app/components/avo/fields/external_image_field/edit_component.html.erb
index 01cadfbaff..fba5988ac6 100644
--- a/app/components/avo/fields/external_image_field/edit_component.html.erb
+++ b/app/components/avo/fields/external_image_field/edit_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= @form.text_field @field.id,
     class: classes("w-full"),
     data: @field.get_html(:data, view: view, element: :input),
diff --git a/app/components/avo/fields/external_image_field/index_component.html.erb b/app/components/avo/fields/external_image_field/index_component.html.erb
index 5e7e4e4f0f..2af824b7b5 100644
--- a/app/components/avo/fields/external_image_field/index_component.html.erb
+++ b/app/components/avo/fields/external_image_field/index_component.html.erb
@@ -1,4 +1,4 @@
-<%= index_field_wrapper **field_wrapper_args, flush: true do %>
+<%= index_field_wrapper(**field_wrapper_args, flush: true) do %>
   <% if @field.value.present? %>
     <%= link_to_if @field.link_to_record.present?,
                    image_tag(@field.value,
diff --git a/app/components/avo/fields/external_image_field/show_component.html.erb b/app/components/avo/fields/external_image_field/show_component.html.erb
index d3eab59e2b..e62beb0234 100644
--- a/app/components/avo/fields/external_image_field/show_component.html.erb
+++ b/app/components/avo/fields/external_image_field/show_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <% if @field.value.present? %>
     <%= image_tag @field.value, style: 'max-width: 340px;' %>
   <% end %>
diff --git a/app/components/avo/fields/file_field/edit_component.html.erb b/app/components/avo/fields/file_field/edit_component.html.erb
index f43a354b44..d17ddec1fd 100644
--- a/app/components/avo/fields/file_field/edit_component.html.erb
+++ b/app/components/avo/fields/file_field/edit_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <% if @field.value.present? %>
     <div class="mb-2">
       <%= render Avo::Fields::Common::Files::ViewType::GridItemComponent.new resource: @resource, field: @field %>
diff --git a/app/components/avo/fields/file_field/index_component.html.erb b/app/components/avo/fields/file_field/index_component.html.erb
index 0ccd2deef0..16e3b5210e 100644
--- a/app/components/avo/fields/file_field/index_component.html.erb
+++ b/app/components/avo/fields/file_field/index_component.html.erb
@@ -1,4 +1,4 @@
-<%= index_field_wrapper **field_wrapper_args, flush: flush? do %>
+<%= index_field_wrapper(**field_wrapper_args, flush: flush?) do %>
   <% if @field.value.present? %>
     <% if @field.value.attached? && @field.value.representable? && @field.is_image %>
       <%= link_to_if @field.link_to_record, image_tag(helpers.main_app.url_for(@field.value), class: 'h-10'), resource_view_path, class: 'block' %>
diff --git a/app/components/avo/fields/file_field/show_component.html.erb b/app/components/avo/fields/file_field/show_component.html.erb
index e5275b9eab..e722ffc55f 100644
--- a/app/components/avo/fields/file_field/show_component.html.erb
+++ b/app/components/avo/fields/file_field/show_component.html.erb
@@ -1,3 +1,3 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= render Avo::Fields::Common::Files::ViewType::GridItemComponent.new resource: @resource, field: @field %>
 <% end %>
diff --git a/app/components/avo/fields/files_field/edit_component.html.erb b/app/components/avo/fields/files_field/edit_component.html.erb
index 78416306f3..0ceac822d4 100644
--- a/app/components/avo/fields/files_field/edit_component.html.erb
+++ b/app/components/avo/fields/files_field/edit_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args, full_width: true do %>
+<%= field_wrapper(**field_wrapper_args, full_width: true) do %>
   <%= render Avo::Fields::Common::Files::ListViewerComponent.new(field: @field, resource: @resource) if @field.value.present? %>
 
   <% if can_upload_file? %>
diff --git a/app/components/avo/fields/files_field/index_component.html.erb b/app/components/avo/fields/files_field/index_component.html.erb
index ef4874b636..4886f7a5d6 100644
--- a/app/components/avo/fields/files_field/index_component.html.erb
+++ b/app/components/avo/fields/files_field/index_component.html.erb
@@ -1,3 +1,3 @@
-<%= index_field_wrapper **field_wrapper_args do %>
+<%= index_field_wrapper(**field_wrapper_args) do %>
   <%= "#{length} #{t('avo.file', count: length)}" %>
 <% end %>
diff --git a/app/components/avo/fields/files_field/show_component.html.erb b/app/components/avo/fields/files_field/show_component.html.erb
index d7a699460a..4bd21b5158 100644
--- a/app/components/avo/fields/files_field/show_component.html.erb
+++ b/app/components/avo/fields/files_field/show_component.html.erb
@@ -1,3 +1,3 @@
-<%= field_wrapper **field_wrapper_args, full_width: true do %>
+<%= field_wrapper(**field_wrapper_args, full_width: true) do %>
   <%= render Avo::Fields::Common::Files::ListViewerComponent.new(field: @field, resource: @resource) if @field.value.present? %>
 <% end %>
diff --git a/app/components/avo/fields/gravatar_field/index_component.html.erb b/app/components/avo/fields/gravatar_field/index_component.html.erb
index eedfc86fed..0c982b713e 100644
--- a/app/components/avo/fields/gravatar_field/index_component.html.erb
+++ b/app/components/avo/fields/gravatar_field/index_component.html.erb
@@ -1,4 +1,4 @@
-<%= index_field_wrapper **field_wrapper_args, flush: true do %>
+<%= index_field_wrapper(**field_wrapper_args, flush: true) do %>
   <%= render Avo::Fields::Common::GravatarViewerComponent.new(
     md5: @field.md5,
     default: @field.default,
diff --git a/app/components/avo/fields/gravatar_field/show_component.html.erb b/app/components/avo/fields/gravatar_field/show_component.html.erb
index 7d7030e9b4..ee83b26ba4 100644
--- a/app/components/avo/fields/gravatar_field/show_component.html.erb
+++ b/app/components/avo/fields/gravatar_field/show_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= render Avo::Fields::Common::GravatarViewerComponent.new(
     md5: @field.md5,
     default: @field.default,
diff --git a/app/components/avo/fields/has_one_field/index_component.html.erb b/app/components/avo/fields/has_one_field/index_component.html.erb
index f90a0f309f..98889749d9 100644
--- a/app/components/avo/fields/has_one_field/index_component.html.erb
+++ b/app/components/avo/fields/has_one_field/index_component.html.erb
@@ -1,3 +1,3 @@
-<%= index_field_wrapper **field_wrapper_args do %>
+<%= index_field_wrapper(**field_wrapper_args) do %>
   <%= link_to @field.label, helpers.resource_path(record: @field.value, resource: @field.target_resource) %>
 <% end %>
diff --git a/app/components/avo/fields/id_field/edit_component.html.erb b/app/components/avo/fields/id_field/edit_component.html.erb
index d7740937a7..de27aa8c7f 100644
--- a/app/components/avo/fields/id_field/edit_component.html.erb
+++ b/app/components/avo/fields/id_field/edit_component.html.erb
@@ -1,3 +1,3 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= @field.value %>
 <% end %>
diff --git a/app/components/avo/fields/id_field/index_component.html.erb b/app/components/avo/fields/id_field/index_component.html.erb
index 6ee29db9c3..a7b13aa6de 100644
--- a/app/components/avo/fields/id_field/index_component.html.erb
+++ b/app/components/avo/fields/id_field/index_component.html.erb
@@ -1,3 +1,3 @@
-<%= index_field_wrapper **field_wrapper_args, class: 'whitespace-no-wrap w-[1%]' do %>
+<%= index_field_wrapper(**field_wrapper_args, class: 'whitespace-no-wrap w-[1%]') do %>
   <% link_to_if (@field.link_to_record or Avo.configuration.id_links_to_resource), @field.value, resource_view_path, title: t('avo.view_item', item: @resource.name).humanize %>
 <% end %>
diff --git a/app/components/avo/fields/id_field/show_component.html.erb b/app/components/avo/fields/id_field/show_component.html.erb
index d7740937a7..de27aa8c7f 100644
--- a/app/components/avo/fields/id_field/show_component.html.erb
+++ b/app/components/avo/fields/id_field/show_component.html.erb
@@ -1,3 +1,3 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= @field.value %>
 <% end %>
diff --git a/app/components/avo/fields/key_value_field/edit_component.html.erb b/app/components/avo/fields/key_value_field/edit_component.html.erb
index 1a90bc9844..afe890faa1 100644
--- a/app/components/avo/fields/key_value_field/edit_component.html.erb
+++ b/app/components/avo/fields/key_value_field/edit_component.html.erb
@@ -1,3 +1,3 @@
-<%= field_wrapper **field_wrapper_args, full_width: true do %>
+<%= field_wrapper(**field_wrapper_args, full_width: true) do %>
   <%= render Avo::Fields::Common::KeyValueComponent.new field: @field, form: @form, view: view %>
 <% end %>
diff --git a/app/components/avo/fields/key_value_field/show_component.html.erb b/app/components/avo/fields/key_value_field/show_component.html.erb
index cf3354b561..2c0dfffb28 100644
--- a/app/components/avo/fields/key_value_field/show_component.html.erb
+++ b/app/components/avo/fields/key_value_field/show_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args, full_width: true do %>
+<%= field_wrapper(**field_wrapper_args, full_width: true) do %>
   <%= render Avo::Fields::Common::KeyValueComponent.new(
       field: @field,
       view: Avo::ViewInquirer.new(:show)
diff --git a/app/components/avo/fields/location_field/edit_component.html.erb b/app/components/avo/fields/location_field/edit_component.html.erb
index 671e2e549c..902f928a08 100644
--- a/app/components/avo/fields/location_field/edit_component.html.erb
+++ b/app/components/avo/fields/location_field/edit_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <% if field.value_as_array? %>
     <div class="flex gap-4">
       <%= @form.fields_for @field.id do |coordinates_form| %>
diff --git a/app/components/avo/fields/location_field/show_component.html.erb b/app/components/avo/fields/location_field/show_component.html.erb
index acd773d788..a20984c233 100644
--- a/app/components/avo/fields/location_field/show_component.html.erb
+++ b/app/components/avo/fields/location_field/show_component.html.erb
@@ -1,7 +1,3 @@
-<%= field_wrapper **field_wrapper_args do %>
-  <% if field.value_present? %>
-    <%= js_map [{latitude: field.value[0], longitude: field.value[1]}], id: "location-map", zoom: field.zoom, controls: true %>
-  <% else %>
-    —
-  <% end %>
+<%= field_wrapper(**field_wrapper_args) do %>
+  <%= field.render_map(params) %>
 <% end %>
diff --git a/app/components/avo/fields/markdown_field/edit_component.rb b/app/components/avo/fields/markdown_field/edit_component.rb
deleted file mode 100644
index 4844dcb3fe..0000000000
--- a/app/components/avo/fields/markdown_field/edit_component.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-
-class Avo::Fields::MarkdownField::EditComponent < Avo::Fields::EditComponent
-end
diff --git a/app/components/avo/fields/markdown_field/show_component.rb b/app/components/avo/fields/markdown_field/show_component.rb
deleted file mode 100644
index a8d7e5fbc3..0000000000
--- a/app/components/avo/fields/markdown_field/show_component.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-
-class Avo::Fields::MarkdownField::ShowComponent < Avo::Fields::ShowComponent
-end
diff --git a/app/components/avo/fields/number_field/edit_component.html.erb b/app/components/avo/fields/number_field/edit_component.html.erb
index 663e76a076..55569a6c1a 100644
--- a/app/components/avo/fields/number_field/edit_component.html.erb
+++ b/app/components/avo/fields/number_field/edit_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= @form.number_field @field.id,
     value: @field.value,
     class: classes("w-full"),
diff --git a/app/components/avo/fields/number_field/index_component.html.erb b/app/components/avo/fields/number_field/index_component.html.erb
index cd04797d85..e8e24ec470 100644
--- a/app/components/avo/fields/number_field/index_component.html.erb
+++ b/app/components/avo/fields/number_field/index_component.html.erb
@@ -1,3 +1,3 @@
-<%= index_field_wrapper **field_wrapper_args do %>
+<%= index_field_wrapper(**field_wrapper_args) do %>
   <%= @field.value %>
 <% end %>
diff --git a/app/components/avo/fields/number_field/show_component.html.erb b/app/components/avo/fields/number_field/show_component.html.erb
index d7740937a7..de27aa8c7f 100644
--- a/app/components/avo/fields/number_field/show_component.html.erb
+++ b/app/components/avo/fields/number_field/show_component.html.erb
@@ -1,3 +1,3 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= @field.value %>
 <% end %>
diff --git a/app/components/avo/fields/password_field/edit_component.html.erb b/app/components/avo/fields/password_field/edit_component.html.erb
index 5a102a784d..56812e8aab 100644
--- a/app/components/avo/fields/password_field/edit_component.html.erb
+++ b/app/components/avo/fields/password_field/edit_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <div class="relative" data-controller="<%= @field.revealable ? 'password-visibility' : nil %>">
     <%= @form.password_field @field.id,
       value: @field.value,
diff --git a/app/components/avo/fields/preview_field/index_component.html.erb b/app/components/avo/fields/preview_field/index_component.html.erb
index 217de5008e..c5cece6693 100644
--- a/app/components/avo/fields/preview_field/index_component.html.erb
+++ b/app/components/avo/fields/preview_field/index_component.html.erb
@@ -1,4 +1,4 @@
-<%= index_field_wrapper **field_wrapper_args, dash_if_blank: false, class: 'whitespace-no-wrap w-[1%]', flush: true, center_content: true do %>
+<%= index_field_wrapper(**field_wrapper_args, dash_if_blank: false, class: 'whitespace-no-wrap w-[1%]', flush: true, center_content: true) do %>
   <%= link_to resource_view_path,
     title: t('avo.view_item', item: @resource.name).humanize,
     data: {
diff --git a/app/components/avo/fields/progress_bar_field/edit_component.html.erb b/app/components/avo/fields/progress_bar_field/edit_component.html.erb
index 09e878e737..7f96d69119 100644
--- a/app/components/avo/fields/progress_bar_field/edit_component.html.erb
+++ b/app/components/avo/fields/progress_bar_field/edit_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= content_tag :div, data: {controller: "progress-bar-field"} do %>
     <% if @field.display_value %>
       <div class="text-center text-sm font-semibold w-full leading-none mb-1">
diff --git a/app/components/avo/fields/progress_bar_field/index_component.html.erb b/app/components/avo/fields/progress_bar_field/index_component.html.erb
index a6eb650f3d..eb520c2ffb 100644
--- a/app/components/avo/fields/progress_bar_field/index_component.html.erb
+++ b/app/components/avo/fields/progress_bar_field/index_component.html.erb
@@ -1,3 +1,3 @@
-<%= index_field_wrapper **field_wrapper_args, flush: true do %>
+<%= index_field_wrapper(**field_wrapper_args, flush: true) do %>
   <%= render Avo::Fields::Common::ProgressBarComponent.new value: @field.value, display_value: @field.display_value, value_suffix: @field.value_suffix, max: @field.max, view: view %>
 <% end %>
diff --git a/app/components/avo/fields/progress_bar_field/show_component.html.erb b/app/components/avo/fields/progress_bar_field/show_component.html.erb
index 1fdb77d233..0d6bf21feb 100644
--- a/app/components/avo/fields/progress_bar_field/show_component.html.erb
+++ b/app/components/avo/fields/progress_bar_field/show_component.html.erb
@@ -1,3 +1,3 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= render Avo::Fields::Common::ProgressBarComponent.new value: @field.value, display_value: @field.display_value, value_suffix: @field.value_suffix, max: @field.max, view: view %>
 <% end %>
diff --git a/app/components/avo/fields/radio_field/edit_component.html.erb b/app/components/avo/fields/radio_field/edit_component.html.erb
index 8e304a1dcf..b2973ff799 100644
--- a/app/components/avo/fields/radio_field/edit_component.html.erb
+++ b/app/components/avo/fields/radio_field/edit_component.html.erb
@@ -1,9 +1,9 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <div class="flex flex-col gap-2">
     <% @field.options.each do |key, value| %>
       <div>
-        <%= form.radio_button @field.id, key %>
-        <%= form.label @field.id, value: value %>
+        <%= form.radio_button @field.id, key, checked: (@field.value.to_s == key.to_s) %>
+        <%= form.label @field.id, value, value: key %>
       </div>
     <% end %>
   </div>
diff --git a/app/components/avo/fields/radio_field/index_component.html.erb b/app/components/avo/fields/radio_field/index_component.html.erb
index 8d4e9d5fda..c116e067ba 100644
--- a/app/components/avo/fields/radio_field/index_component.html.erb
+++ b/app/components/avo/fields/radio_field/index_component.html.erb
@@ -1,3 +1,3 @@
-<%= index_field_wrapper **field_wrapper_args do %>
+<%= index_field_wrapper(**field_wrapper_args) do %>
   <%== @field.value %>
 <% end %>
diff --git a/app/components/avo/fields/radio_field/show_component.html.erb b/app/components/avo/fields/radio_field/show_component.html.erb
index de7fe73231..73c1cfd944 100644
--- a/app/components/avo/fields/radio_field/show_component.html.erb
+++ b/app/components/avo/fields/radio_field/show_component.html.erb
@@ -1,3 +1,3 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%== @field.value %>
 <% end %>
diff --git a/app/components/avo/fields/select_field/edit_component.html.erb b/app/components/avo/fields/select_field/edit_component.html.erb
index 6247150377..6b92530928 100644
--- a/app/components/avo/fields/select_field/edit_component.html.erb
+++ b/app/components/avo/fields/select_field/edit_component.html.erb
@@ -1,7 +1,8 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= @form.select @field.id, options_for_select(@field.options_for_select, selected: @field.value), {
       include_blank: @field.include_blank
     },
+    multiple: @field.multiple,
     aria: {
       placeholder: @field.placeholder
     },
diff --git a/app/components/avo/fields/select_field/index_component.html.erb b/app/components/avo/fields/select_field/index_component.html.erb
index 9e210d46d0..bea771b78d 100644
--- a/app/components/avo/fields/select_field/index_component.html.erb
+++ b/app/components/avo/fields/select_field/index_component.html.erb
@@ -1,3 +1,3 @@
-<%= index_field_wrapper **field_wrapper_args do %>
+<%= index_field_wrapper(**field_wrapper_args) do %>
   <%= @field.label %>
 <% end %>
diff --git a/app/components/avo/fields/select_field/show_component.html.erb b/app/components/avo/fields/select_field/show_component.html.erb
index 5e55c25294..70916d4132 100644
--- a/app/components/avo/fields/select_field/show_component.html.erb
+++ b/app/components/avo/fields/select_field/show_component.html.erb
@@ -1,3 +1,3 @@
-<%= field_wrapper **field_wrapper_args.merge(dash_if_blank: false) do %>
-  <%= @field.value.nil? ? "—" : @field.label %>
+<%= field_wrapper(**field_wrapper_args.merge(dash_if_blank: false)) do %>
+  <%= @field.label %>
 <% end %>
diff --git a/app/components/avo/fields/status_field/edit_component.html.erb b/app/components/avo/fields/status_field/edit_component.html.erb
index f2b39f75cf..5f487234a8 100644
--- a/app/components/avo/fields/status_field/edit_component.html.erb
+++ b/app/components/avo/fields/status_field/edit_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= @form.text_field @field.id,
     class: classes("w-full"),
     data: @field.get_html(:data, view: view, element: :input),
diff --git a/app/components/avo/fields/status_field/index_component.html.erb b/app/components/avo/fields/status_field/index_component.html.erb
index 86ba99d9c1..b1f6edcb30 100644
--- a/app/components/avo/fields/status_field/index_component.html.erb
+++ b/app/components/avo/fields/status_field/index_component.html.erb
@@ -1,3 +1,3 @@
-<%= index_field_wrapper **field_wrapper_args do %>
+<%= index_field_wrapper(**field_wrapper_args) do %>
   <%= render Avo::Fields::Common::StatusViewerComponent.new label: @field.value, status: @field.status %>
 <% end %>
diff --git a/app/components/avo/fields/status_field/show_component.html.erb b/app/components/avo/fields/status_field/show_component.html.erb
index 40f09fe854..16b6ebb852 100644
--- a/app/components/avo/fields/status_field/show_component.html.erb
+++ b/app/components/avo/fields/status_field/show_component.html.erb
@@ -1,3 +1,3 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= render Avo::Fields::Common::StatusViewerComponent.new label: @field.value, status: @field.status %>
 <% end %>
diff --git a/app/components/avo/fields/tags_field/edit_component.html.erb b/app/components/avo/fields/tags_field/edit_component.html.erb
index 2228aa1ca9..4ae0ffb319 100644
--- a/app/components/avo/fields/tags_field/edit_component.html.erb
+++ b/app/components/avo/fields/tags_field/edit_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args, data: {
+<%= field_wrapper(**field_wrapper_args, data: {
       controller: "tags-field",
       tags_field_mode_value: @field.mode,
       tags_field_whitelist_items_value: @field.whitelist_items,
@@ -8,7 +8,7 @@
       tags_field_close_on_select_value: @field.close_on_select,
       tags_field_delimiters_value: @field.delimiters,
       tags_field_fetch_values_from_value: @field.fetch_values_from,
-    } do %>
+    }) do %>
     <%# We use a dummy field so the back action from Turbo does not brake the field %>
     <%# dummy field %>
     <%= text_field_tag "#{@field.id}-dummy", '',
@@ -30,6 +30,6 @@
       disabled: disabled?,
       placeholder: @field.placeholder,
       style: @field.get_html(:style, view: view, element: :input),
-      value: @field.select_mode? ? @field.field_value.first : @field.field_value.to_json
+      value: @field.field_value.to_json
     %>
 <% end %>
diff --git a/app/components/avo/fields/tags_field/index_component.html.erb b/app/components/avo/fields/tags_field/index_component.html.erb
index 481a4f9b83..e92830686c 100644
--- a/app/components/avo/fields/tags_field/index_component.html.erb
+++ b/app/components/avo/fields/tags_field/index_component.html.erb
@@ -1,4 +1,4 @@
-<%= index_field_wrapper **field_wrapper_args, flush: true do %>
+<%= index_field_wrapper(**field_wrapper_args, flush: true) do %>
   <div class="flex gap-1 items-center flex-nowrap">
     <% value.take(3).each do |item| %>
       <%= render Avo::Fields::TagsField::TagComponent.new(label: label_from_item(item)) %>
diff --git a/app/components/avo/fields/tags_field/show_component.html.erb b/app/components/avo/fields/tags_field/show_component.html.erb
index 36f9e9f092..67a8182d60 100644
--- a/app/components/avo/fields/tags_field/show_component.html.erb
+++ b/app/components/avo/fields/tags_field/show_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <div class="flex gap-1 items-center flex-wrap">
     <% @field.field_value.each do |item| %>
       <%= render Avo::Fields::TagsField::TagComponent.new(label: label_from_item(item)) %>
diff --git a/app/components/avo/fields/text_field/edit_component.html.erb b/app/components/avo/fields/text_field/edit_component.html.erb
index 540ee3bd1c..3288d855c8 100644
--- a/app/components/avo/fields/text_field/edit_component.html.erb
+++ b/app/components/avo/fields/text_field/edit_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= form.text_field @field.id,
     value: @field.value,
     class: classes("w-full"),
diff --git a/app/components/avo/fields/text_field/index_component.html.erb b/app/components/avo/fields/text_field/index_component.html.erb
index 8aef218117..1713022505 100644
--- a/app/components/avo/fields/text_field/index_component.html.erb
+++ b/app/components/avo/fields/text_field/index_component.html.erb
@@ -1,4 +1,4 @@
-<%= index_field_wrapper **field_wrapper_args do %>
+<%= index_field_wrapper(**field_wrapper_args) do %>
   <% if @field.as_html %>
     <%== @field.value %>
   <% elsif @field.protocol.present? %>
diff --git a/app/components/avo/fields/text_field/show_component.html.erb b/app/components/avo/fields/text_field/show_component.html.erb
index cd802170c7..79ee8b7c70 100644
--- a/app/components/avo/fields/text_field/show_component.html.erb
+++ b/app/components/avo/fields/text_field/show_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <% if @field.as_html %>
     <%== @field.value %>
   <% elsif @field.protocol.present? %>
diff --git a/app/components/avo/fields/textarea_field/edit_component.html.erb b/app/components/avo/fields/textarea_field/edit_component.html.erb
index e4d5382164..79096a9e2b 100644
--- a/app/components/avo/fields/textarea_field/edit_component.html.erb
+++ b/app/components/avo/fields/textarea_field/edit_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= @form.text_area @field.id,
     value: @field.value,
     class: classes("w-full"),
diff --git a/app/components/avo/fields/textarea_field/show_component.html.erb b/app/components/avo/fields/textarea_field/show_component.html.erb
index 16af576b87..0e783261e5 100644
--- a/app/components/avo/fields/textarea_field/show_component.html.erb
+++ b/app/components/avo/fields/textarea_field/show_component.html.erb
@@ -1,3 +1,3 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <div class="whitespace-pre-line"><%= @field.value %></div>
 <% end %>
diff --git a/app/components/avo/fields/time_field/edit_component.html.erb b/app/components/avo/fields/time_field/edit_component.html.erb
index 5fb2fe741f..fa6e670b8a 100644
--- a/app/components/avo/fields/time_field/edit_component.html.erb
+++ b/app/components/avo/fields/time_field/edit_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= content_tag :div, class: "flex relative", data: {
       controller: "date-field",
       date_field_view_value: @view,
diff --git a/app/components/avo/fields/time_field/index_component.html.erb b/app/components/avo/fields/time_field/index_component.html.erb
index 0eb121fab1..b6cda26ad5 100644
--- a/app/components/avo/fields/time_field/index_component.html.erb
+++ b/app/components/avo/fields/time_field/index_component.html.erb
@@ -1,4 +1,4 @@
-<%= index_field_wrapper **field_wrapper_args do %>
+<%= index_field_wrapper(**field_wrapper_args) do %>
    <%= content_tag :div, data: {
     controller: "date-field",
     date_field_view_value: @view,
diff --git a/app/components/avo/fields/time_field/show_component.html.erb b/app/components/avo/fields/time_field/show_component.html.erb
index 3d81897829..4dd97bd0e3 100644
--- a/app/components/avo/fields/time_field/show_component.html.erb
+++ b/app/components/avo/fields/time_field/show_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= content_tag :div, data: {
     controller: "date-field",
     date_field_view_value: @view,
diff --git a/app/components/avo/fields/tiptap_field/edit_component.html.erb b/app/components/avo/fields/tiptap_field/edit_component.html.erb
index c57f3e19d4..e3bd738028 100644
--- a/app/components/avo/fields/tiptap_field/edit_component.html.erb
+++ b/app/components/avo/fields/tiptap_field/edit_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= content_tag :div,
     class: "tiptap__field",
     data: {
diff --git a/app/components/avo/fields/tiptap_field/show_component.html.erb b/app/components/avo/fields/tiptap_field/show_component.html.erb
index 08d7c50e21..0787a2d7cd 100644
--- a/app/components/avo/fields/tiptap_field/show_component.html.erb
+++ b/app/components/avo/fields/tiptap_field/show_component.html.erb
@@ -1,13 +1,9 @@
-<%= field_wrapper **field_wrapper_args do %>
-  <%
-    content_classes = 'tiptap__content py-2 max-w-4xl'
-    content_classes << ' hidden' unless @field.always_show
-  %>
-  <div data-controller="hidden-input">
+<%= field_wrapper(**field_wrapper_args, data: { controller: 'hidden-input' }) do %>
+  <div data-controller="hidden-input" class="flex w-full">
     <% unless @field.always_show %>
       <%= link_to t('avo.show_content'), 'javascript:void(0);', class: 'font-bold inline-block', data: { action: 'click->hidden-input#showContent' } %>
     <% end %>
-    <div class="<%= content_classes %> " data-hidden-input-target="content">
+    <div class="<%= class_names("tiptap__content py-2 max-w-4xl", "hidden": !@field.always_show) %> " data-hidden-input-target="content">
       <%= sanitize @field.value.to_s %>
     </div>
   </div>
diff --git a/app/components/avo/fields/trix_field/edit_component.html.erb b/app/components/avo/fields/trix_field/edit_component.html.erb
index 01fdae224e..b7e1b7fbe2 100644
--- a/app/components/avo/fields/trix_field/edit_component.html.erb
+++ b/app/components/avo/fields/trix_field/edit_component.html.erb
@@ -1,18 +1,14 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= content_tag :div,
-    class: "relative block overflow-x-auto max-w-4xl",
-    data: {
-      controller: "trix-field",
-      trix_field_target: "controller",
-      **data_values,
-    } do %>
+    class: class_names("relative block overflow-x-auto max-w-4xl", @input_id),
+    data: do %>
     <%= content_tag 'trix-editor',
       class: 'trix-content',
       data: {
         "trix-field-target": "editor",
         **@field.get_html(:data, view: view, element: :input)
       },
-      input: trix_id,
+      input: @input_id,
       placeholder: @field.placeholder do %>
       <%= sanitize @field.value.to_s %>
     <% end %>
@@ -21,7 +17,7 @@
       class: classes("w-full hidden"),
       data: @field.get_html(:data, view: view, element: :input),
       disabled: disabled?,
-      id: trix_id,
+      id: @input_id,
       placeholder: @field.placeholder,
       style: @field.get_html(:style, view: view, element: :input)
     %>
diff --git a/app/components/avo/fields/trix_field/edit_component.rb b/app/components/avo/fields/trix_field/edit_component.rb
index af067ce428..a19ebbef84 100644
--- a/app/components/avo/fields/trix_field/edit_component.rb
+++ b/app/components/avo/fields/trix_field/edit_component.rb
@@ -9,20 +9,21 @@ def initialize(**args)
     @resource_name = args[:resource_name] || @resource&.singular_route_key
 
     super(**args)
-  end
 
-  def trix_id
-    if @resource_name.present?
-      "trix_#{@resource_name}_#{@field.id}"
+    @input_id = if @resource_name.present?
+      "#{@field.type}_#{@resource_name}_#{@field.id}"
     elsif form.present?
-      "trix_#{form.index}_#{@field.id}"
+      "#{@field.type}_#{form.index}_#{@field.id}"
     end
   end
 
-  def data_values
-    {
+  # The controller element should have a unique_selector attribute.
+  # It's used to identify the specific editor for the media library to delegate the attach event to.
+  def data
+    values = {
       resource_name: @resource_name,
       resource_id: @resource_id,
+      unique_selector: ".#{@input_id}", # mandatory
       attachments_disabled: @field.attachments_disabled,
       attachment_key: @field.attachment_key,
       hide_attachment_filename: @field.hide_attachment_filename,
@@ -33,5 +34,12 @@ def data_values
       attachment_disable_warning: t("avo.this_field_has_attachments_disabled"),
       attachment_key_warning: t("avo.you_havent_set_attachment_key")
     }.transform_keys { |key| "trix_field_#{key}_value" }
+
+    {
+      controller: "trix-field",
+      trix_field_target: "controller",
+      action: "insert-attachment->trix-field#insertAttachment",
+      **values,
+    }
   end
 end
diff --git a/app/components/avo/fields/trix_field/show_component.html.erb b/app/components/avo/fields/trix_field/show_component.html.erb
index 4a45444f10..fb1ccdc8f7 100644
--- a/app/components/avo/fields/trix_field/show_component.html.erb
+++ b/app/components/avo/fields/trix_field/show_component.html.erb
@@ -1,15 +1,11 @@
-<%= field_wrapper **field_wrapper_args do %>
-  <%
-    content_classes = 'trix-content py-2 max-w-4xl'
-    content_classes << ' hidden' unless @field.always_show
-    button_classes = 'font-bold inline-block pt-3'
-  %>
+<%= field_wrapper(**field_wrapper_args, full_width: true) do %>
+  <% button_classes = 'font-semibold inline-block pt-3 text-sm' %>
   <%= content_tag :div,
     data: {
       controller: "trix-body",
       trix_body_always_show_value: @field.always_show
     } do %>
-    <div class="<%= content_classes %>" data-trix-body-target="content">
+    <div class="<%= class_names("trix-content border-none px-0 py-2 max-w-4xl", "hidden": !@field.always_show) %>" data-trix-body-target="content">
       <%= sanitize @field.value.to_s %>
     </div>
     <% unless @field.always_show %>
diff --git a/app/components/avo/index/resource_controls_component.rb b/app/components/avo/index/resource_controls_component.rb
index fad6879120..b253068293 100644
--- a/app/components/avo/index/resource_controls_component.rb
+++ b/app/components/avo/index/resource_controls_component.rb
@@ -16,6 +16,9 @@ def can_detach?
   end
 
   def can_edit?
+    # Disable edit for ArrayResources
+    return false if @resource.resource_type_array?
+
     return authorize_association_for(:edit) if @reflection.present?
 
     @resource.authorization.authorize_action(:edit, raise_exception: false)
diff --git a/app/components/avo/index/table_row_component.html.erb b/app/components/avo/index/table_row_component.html.erb
index 5668ae53e6..3cd52c5752 100644
--- a/app/components/avo/index/table_row_component.html.erb
+++ b/app/components/avo/index/table_row_component.html.erb
@@ -2,7 +2,7 @@
 
 <%= content_tag :tr,
   id: "#{self.class.to_s.underscore}_#{@resource.record.to_param}",
-  class: class_names("bg-white hover:bg-gray-50 hover:shadow-row z-21 border-b", {"cursor-pointer": click_row_to_view_record}),
+  class: class_names("group bg-white hover:bg-gray-50 z-21 border-b", {"cursor-pointer": click_row_to_view_record}),
   data: {
     index: @index,
     component_name: self.class.to_s.underscore,
@@ -22,8 +22,8 @@
       </div>
     </td>
   <% end %>
-  <% if @resource.resource_controls_render_on_the_left? %>
-    <td class="text-right whitespace-nowrap w-px" data-control="resource-controls">
+  <% if @resource.render_row_controls_on_the_left? %>
+    <td class="<%= @resource.row_controls_classes %>" data-control="resource-controls">
       <div class="flex items-center justify-end flex-grow-0 h-full">
         <%= render resource_controls_component %>
       </div>
@@ -41,11 +41,11 @@
         parent_resource: @parent_resource
       ) %>
     <% else %>
-      <td class="text-center">—</td>
+      <td class="px-3">—</td>
     <% end %>
   <% end %>
-  <% if @resource.resource_controls_render_on_the_right? %>
-    <td class="text-right whitespace-nowrap px-3" data-control="resource-controls">
+  <% if @resource.render_row_controls_on_the_right? %>
+    <td class="<%= @resource.row_controls_classes %>" data-control="resource-controls">
       <div class="flex items-center justify-end flex-grow-0 h-full">
         <%= render resource_controls_component %>
       </div>
diff --git a/app/components/avo/media_library/item_details_component.html.erb b/app/components/avo/media_library/item_details_component.html.erb
new file mode 100644
index 0000000000..e294c38eeb
--- /dev/null
+++ b/app/components/avo/media_library/item_details_component.html.erb
@@ -0,0 +1,32 @@
+<div class="relative flex flex-col w-full max @container/details">
+  <%= link_to helpers.svg('heroicons/outline/x-mark', class: "size-6"), helpers.avo.media_library_index_path,
+    class: "absolute z-10 inset-auto right-0 top-0 mt-2 mr-2 block bg-white p-1 rounded-lg text-slate-600 hover:text-slate-900",
+    title: t('avo.close'),
+    data: {
+      tippy: :tooltip,
+    } %>
+  <div class="flex flex-1 flex-row w-full">
+    <div class="flex flex-col justify-center w-1/2 @3xl/details:w-2/3 p-4 gap-2">
+      <% if @blob.image? %>
+        <%= image_tag helpers.main_app.url_for(@blob), class: "max-w-full rounded-lg max-h-xl", loading: :lazy %>
+      <% elsif @blob.audio? %>
+        <%= audio_tag(helpers.main_app.url_for(@blob), controls: true, preload: false, class: 'w-full') %>
+      <% elsif @blob.video? %>
+        <%= video_tag(helpers.main_app.url_for(@blob), controls: true, preload: false, class: 'w-full') %>
+      <% else %>
+        <div class="relative h-full flex flex-col justify-center items-center w-full bg-slate-100">
+          <%= helpers.svg "heroicons/outline/document-text", class: 'h-10 text-gray-600 mb-2' %>
+        </div>
+      <% end %>
+      <div class="flex justify-center w-full text-sm gap-4">
+        <%= link_to "Download", helpers.main_app.url_for(@blob), download: true %>
+        <%= link_to "Copy URL to clipboard", helpers.main_app.url_for(@blob), data: {controller: "copy-to-clipboard", text: helpers.main_app.url_for(@blob), action: "click->copy-to-clipboard#copy"} %>
+        <%= link_to "Delete", helpers.avo.media_library_path(@blob), class: "text-red-500", data: {turbo_confirm: "Are you sure you want to destroy this attachment?", turbo_method: :delete} %>
+      </div>
+    </div>
+    <div class="flex flex-col w-1/2 @3xl/details:w-1/3 border-l">
+      <%= render partial: "avo/media_library/information", locals: {blob: @blob} %>
+      <%= render partial: "avo/media_library/form", locals: {blob: @blob} %>
+    </div>
+  </div>
+</div>
diff --git a/app/components/avo/media_library/item_details_component.rb b/app/components/avo/media_library/item_details_component.rb
new file mode 100644
index 0000000000..ac3edad0f5
--- /dev/null
+++ b/app/components/avo/media_library/item_details_component.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Avo
+  module MediaLibrary
+    class ItemDetailsComponent < Avo::BaseComponent
+      include Turbo::FramesHelper
+      include Avo::ApplicationHelper
+
+      prop :blob
+    end
+  end
+end
diff --git a/app/components/avo/media_library/list_component.html.erb b/app/components/avo/media_library/list_component.html.erb
new file mode 100644
index 0000000000..c410dd4453
--- /dev/null
+++ b/app/components/avo/media_library/list_component.html.erb
@@ -0,0 +1,62 @@
+<%= render Avo::PanelComponent.new title: t("avo.media_library.title"),
+  data: {
+    controller: 'media-library',
+    media_library_controller_selector_value: params[:controller_selector],
+    media_library_controller_name_value: params[:controller_name],
+    media_library_item_details_frame_id_value: ::Avo::MEDIA_LIBRARY_ITEM_DETAILS_FRAME_ID,
+  } do |c| %>
+  <%= c.with_tools do %>
+    <% if false && @attaching %>
+      <%= a_button data: {
+        action: 'click->media-library#selectItems',
+      } do %>
+        Attach
+      <% end %>
+    <% end %>
+  <% end %>
+  <% c.with_body do %>
+    <% if !@attaching %>
+      <%= content_tag :div, class: "p-4 pb-0",
+        data: {
+          controller: 'media-library-attach',
+          media_library_attach_direct_uploads_url_value: helpers.main_app.rails_direct_uploads_url,
+        } do %>
+        <%= content_tag :div,
+          class: 'dropzone relative py-6 text-center border-dashed border-2 border-gray-300 rounded-lg justify-center items-center flex flex-col text-gray-400 hover:border-primary-500 cursor-pointer',
+          data: {
+            media_library_attach_target: 'dropzone',
+            action: 'click->media-library-attach#triggerFileBrowser',
+          } do %>
+          <%= helpers.svg 'heroicons/outline/cloud-arrow-up', class: 'size-6 text-gray-400' %>
+          Upload a file
+          <small>Click to browse or drag and drop</small>
+        <% end %>
+
+        <%= content_tag :div, "", class: "m-2 flex flex-wrap gap-2 empty:m-0", data: {
+          media_library_attach_target: 'uploadingContainer',
+          turbo_permanent: true,
+        } %>
+      <% end %>
+    <% end %>
+    <div class="grid grow-0 min-h-24 gap-x-4 @container/index" style="grid-template-areas: 'stack';">
+      <div class="grid grid-cols-1 @sm/index:grid-cols-2 @lg/index:grid-cols-3 @3xl/index:grid-cols-4 @5xl/index:grid-cols-6 gap-4 min-h-0 min-w-0 auto-rows-max p-4" style="grid-area: stack;">
+        <%= render Avo::MediaLibrary::ListItemComponent.with_collection(@blobs, attaching: @attaching, multiple: @attaching) %>
+      </div>
+      <%# TODO: fix the extra margin  %>
+      <%= helpers.turbo_frame_tag ::Avo::MEDIA_LIBRARY_ITEM_DETAILS_FRAME_ID, class: 'relative empty:hidden bg-white inset-0 w-full h-full block empty:-ml-4 max-h-full', style: 'grid-area: stack;' %>
+    </div>
+  <% end %>
+  <% c.with_bare_content do %>
+    <div class="flex-1 flex w-full mt-4">
+      <div class="flex-2 w-full sm:flex sm:items-center sm:justify-between space-y-2 sm:space-y-0 text-center sm:text-left pagy-gem-version-<%= helpers.pagy_major_version %> ">
+        <div class="text-sm text-slate-600 mr-4"><%== helpers.pagy_info @pagy %></div>
+        <% if @pagy.pages > 1 %>
+          <%# xanchor_string is not valid key word argument and it breaks when require "pagy/extras/calendar" %>
+          <%# https://github.com/ddnexus/pagy/blob/d70e443872a5b18da4e482454b3c8b4a1c86cb6b/gem/lib/pagy/extras/calendar.rb#L47 %>
+          <%#== helpers.pagy_nav(@pagy, xanchor_string: "data-turbo-frame=\"#{@turbo_frame}\"") %>
+          <%== helpers.pagy_nav(@pagy) %>
+        <% end %>
+      </div>
+    </div>
+  <% end %>
+<% end %>
diff --git a/app/components/avo/media_library/list_component.rb b/app/components/avo/media_library/list_component.rb
new file mode 100644
index 0000000000..c085473916
--- /dev/null
+++ b/app/components/avo/media_library/list_component.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Avo
+  module MediaLibrary
+    class ListComponent < Avo::BaseComponent
+      include Avo::ApplicationHelper
+      include Pagy::Backend
+
+      def initialize(attaching: false, turbo_frame: nil)
+        @attaching = attaching
+        @pagy, @blobs = pagy(query, limit:)
+        turbo_frame ||= params[:turbo_frame]
+        @turbo_frame = turbo_frame.present? ? CGI.escapeHTML(turbo_frame.to_s) : :_top
+      end
+
+      def controller = Avo::Current.view_context.controller
+
+      def query
+        ActiveStorage::Blob.includes(:attachments)
+          # ignore blobs who are just a variant to avoid "n+1" blob creation
+          .where.not(id: ActiveStorage::Attachment.where(record_type: "ActiveStorage::VariantRecord").select(:blob_id))
+          .order(created_at: :desc)
+      end
+
+      def limit = @attaching ? 12 : 24
+    end
+  end
+end
diff --git a/app/components/avo/media_library/list_item_component.html.erb b/app/components/avo/media_library/list_item_component.html.erb
new file mode 100644
index 0000000000..2d1d124405
--- /dev/null
+++ b/app/components/avo/media_library/list_item_component.html.erb
@@ -0,0 +1,26 @@
+<%= link_to helpers.avo.media_library_path(blob),
+  id: dom_id(blob),
+  class: "relative group min-h-full max-w-full flex-1 flex flex-col justify-between gap-2 border border-slate-200 p-1.5 rounded-xl hover:border-blue-500 hover:outline data-[selected=true]:border-blue-500 data-[selected=true]:outline outline-2 outline-blue-500",
+  data: do %>
+  <% if false && @attaching %>
+    <div class="absolute bg-blue-500 group-hover:opacity-100 group-data-[selected=true]:opacity-100 opacity-0 inset-auto left-0 top-0 text-white rounded-tl-xl rounded-br-xl -ml-px -mt-px p-2"><div class="border border-white"><%= helpers.svg "heroicons/outline/check", class: 'group-data-[selected=true]:opacity-100 opacity-0 size-4' %></div></div>
+  <% end %>
+  <div class="flex flex-col h-full aspect-video overflow-hidden rounded-lg justify-center items-center">
+    <% if blob.image? %>
+      <%= image_tag helpers.main_app.url_for(blob.variant(resize_to_limit: [600, 600])), class: "max-w-full self-start #{@extra_classes}", loading: :lazy, width: blob.metadata["width"], height: blob.metadata["height"] %>
+    <% elsif blob.audio? %>
+      <%= audio_tag(helpers.main_app.url_for(blob), controls: true, preload: false, class: 'w-full') %>
+    <% elsif blob.video? %>
+      <%= video_tag(helpers.main_app.url_for(blob), controls: true, preload: false, class: 'w-full') %>
+    <% else %>
+      <div class="relative h-full flex flex-col justify-center items-center w-full bg-slate-100">
+        <%= helpers.svg "heroicons/outline/document-text", class: 'h-10 text-gray-600 mb-2' %>
+      </div>
+    <% end %>
+  </div>
+  <div class="flex space-x-2 mb-1">
+    <% if @display_filename %>
+      <span class="text-gray-500 group-hover:text-blue-700 mt-1 text-sm truncate" title="<%= blob.filename %>"><%= blob.filename %></span>
+    <% end %>
+  </div>
+<% end %>
diff --git a/app/components/avo/media_library/list_item_component.rb b/app/components/avo/media_library/list_item_component.rb
new file mode 100644
index 0000000000..5342f8c8ec
--- /dev/null
+++ b/app/components/avo/media_library/list_item_component.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Avo
+  module MediaLibrary
+    class ListItemComponent < Avo::BaseComponent
+      with_collection_parameter :blob
+
+      prop :blob, reader: :public
+      prop :display_filename, default: true
+      prop :attaching, default: false
+      prop :multiple, default: false
+
+      def data
+        {
+          component: component_name,
+          blob_id: blob.id,
+          media_library_blob_param: blob.as_json,
+          media_library_path_param: helpers.main_app.rails_blob_path(blob),
+          media_library_url_param: helpers.main_app.url_for(blob),
+          media_library_attaching_param: @attaching,
+          media_library_multiple_param: @multiple,
+          media_library_selected_item: params[:controller_selector],
+          action: "click->media-library#selectItem"
+        }.tap do |result|
+          if @attaching
+            result[:turbo_frame] = Avo::MEDIA_LIBRARY_ITEM_DETAILS_FRAME_ID
+            result[:turbo_prefetch] = false
+          else
+            result[:turbo_prefetch] = true
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/app/components/avo/paginator_component.html.erb b/app/components/avo/paginator_component.html.erb
index c5c8b649b7..976add7fa7 100644
--- a/app/components/avo/paginator_component.html.erb
+++ b/app/components/avo/paginator_component.html.erb
@@ -24,7 +24,7 @@
     </div>
   </div>
   <div class="flex">
-    <div class="flex-2 sm:flex sm:items-center sm:justify-between space-y-2 sm:space-y-0 text-center sm:text-left pagy-gem-version-<%= pagy_major_version %>">
+    <div class="flex-2 sm:flex sm:items-center sm:justify-between space-y-2 sm:space-y-0 text-center sm:text-left pagy-gem-version-<%= helpers.pagy_major_version %>">
       <% if @resource.pagination_type.default? %>
         <div class="text-sm text-slate-600 mr-4"><%== helpers.pagy_info @pagy %></div>
       <% end %>
diff --git a/app/components/avo/paginator_component.rb b/app/components/avo/paginator_component.rb
index 318197b7fa..cfac81f33d 100644
--- a/app/components/avo/paginator_component.rb
+++ b/app/components/avo/paginator_component.rb
@@ -39,13 +39,4 @@ def per_page_options
       options.sort.uniq
     end
   end
-
-  def pagy_major_version
-    return nil unless defined?(Pagy::VERSION)
-    version = Pagy::VERSION&.split(".")&.first&.to_i
-
-    return "8-or-more" if version >= 8
-
-    version
-  end
 end
diff --git a/app/components/avo/panel_component.rb b/app/components/avo/panel_component.rb
index 131ff23da8..88a8b3cceb 100644
--- a/app/components/avo/panel_component.rb
+++ b/app/components/avo/panel_component.rb
@@ -38,6 +38,6 @@ def classes
   private
 
   def data_attributes
-    @data.merge({"panel-index": @index})
+    @data.merge(component: @data[:component] || self.class.to_s.underscore, "panel-index": @index)
   end
 end
diff --git a/app/components/avo/profile_item_component.html.erb b/app/components/avo/profile_item_component.html.erb
index bf093f6859..b97119becb 100644
--- a/app/components/avo/profile_item_component.html.erb
+++ b/app/components/avo/profile_item_component.html.erb
@@ -5,6 +5,7 @@
     target: target,
     title: title,
     method: method,
+    disabled: disabled,
     params: params do %>
     <%= helpers.svg(icon, class: 'h-4 mr-1') if icon.present? %> <%= label %>
   <% end %>
diff --git a/app/components/avo/profile_item_component.rb b/app/components/avo/profile_item_component.rb
index 16567d40bc..a719345290 100644
--- a/app/components/avo/profile_item_component.rb
+++ b/app/components/avo/profile_item_component.rb
@@ -12,6 +12,7 @@ class Avo::ProfileItemComponent < Avo::BaseComponent
   end
   prop :title, reader: :public
   prop :method, reader: :public
+  prop :disabled, reader: :public
   prop :params, default: {}.freeze, reader: :public
   prop :classes, default: "", reader: :public
 
diff --git a/app/components/avo/referrer_params_component.html.erb b/app/components/avo/referrer_params_component.html.erb
index 4c32536627..7da6225f9e 100644
--- a/app/components/avo/referrer_params_component.html.erb
+++ b/app/components/avo/referrer_params_component.html.erb
@@ -4,4 +4,5 @@
 <%= hidden_field_tag :via_record_id, params[:via_record_id] if params[:via_record_id] %>
 <%= hidden_field_tag :via_relation, params[:via_relation] if params[:via_relation] %>
 <%= hidden_field_tag :via_belongs_to_resource_class, params[:via_belongs_to_resource_class] if params[:via_belongs_to_resource_class] %>
+<%= hidden_field_tag :return_to, params[:return_to] if params[:return_to].present? %>
 <%= hidden_field_tag :referrer, @back_path if params[:via_resource_class] %>
diff --git a/app/components/avo/resource_component.rb b/app/components/avo/resource_component.rb
index 3974ada360..36b9c48ad3 100644
--- a/app/components/avo/resource_component.rb
+++ b/app/components/avo/resource_component.rb
@@ -1,6 +1,7 @@
 class Avo::ResourceComponent < Avo::BaseComponent
   include Avo::Concerns::ChecksAssocAuthorization
   include Avo::Concerns::RequestMethods
+  include Avo::Concerns::HasResourceStimulusControllers
 
   attr_reader :fields_by_panel
   attr_reader :has_one_panels
@@ -40,12 +41,18 @@ def detach_path
   end
 
   def can_see_the_edit_button?
+    # Disable edit for ArrayResources
+    return false if @resource.resource_type_array?
+
     return authorize_association_for(:edit) if @reflection.present?
 
     @resource.authorization.authorize_action(:edit, raise_exception: false)
   end
 
   def can_see_the_destroy_button?
+    # Disable destroy for ArrayResources
+    return false if @resource.resource_type_array?
+
     @resource.authorization.authorize_action(:destroy, raise_exception: false)
   end
 
@@ -184,14 +191,18 @@ def render_delete_button(control)
   def render_save_button(control)
     return unless can_see_the_save_button?
 
+    data_attributes = {
+      turbo_confirm: @resource.confirm_on_save ? t("avo.are_you_sure") : nil
+    }
+
+    add_stimulus_attributes_for(@resource, data_attributes, "saveButton")
+
     a_button color: :primary,
       style: :primary,
       loading: true,
       type: :submit,
       icon: "avo/save",
-      data: {
-        turbo_confirm: @resource.confirm_on_save ? t("avo.are_you_sure") : nil
-      } do
+      data: data_attributes do
       control.label
     end
   end
@@ -290,7 +301,8 @@ def render_action(action)
         turbo_prefetch: false,
         # When action has record present behave as standalone and keep always active.
         "actions-picker-target": (action.action.standalone || action.action.record.present?) ? "standaloneAction" : "resourceAction",
-        disabled: action.action.disabled?
+        disabled: action.action.disabled?,
+        resource_name: action.action.resource.model_key
       } do
       action.label
     end
diff --git a/app/components/avo/sidebar_component.html.erb b/app/components/avo/sidebar_component.html.erb
index f43d39f811..ddaed9ae66 100644
--- a/app/components/avo/sidebar_component.html.erb
+++ b/app/components/avo/sidebar_component.html.erb
@@ -51,6 +51,10 @@
               </div>
             </div>
           <% end %>
+
+          <% if Avo::MediaLibrary.configuration.visible? %>
+            <%= render Avo::Sidebar::LinkComponent.new label: 'Media Library', path: helpers.avo.media_library_index_path, active: :exclusive %>
+          <% end %>
         <% end %>
 
         <%= render partial: "/avo/partials/sidebar_extra" %>
diff --git a/app/components/avo/tab_content_component.html.erb b/app/components/avo/tab_content_component.html.erb
new file mode 100644
index 0000000000..20dae1533a
--- /dev/null
+++ b/app/components/avo/tab_content_component.html.erb
@@ -0,0 +1,5 @@
+<div class="space-y-12">
+  <% @tab.visible_items.each do |item| %>
+    <%= render Avo::Items::SwitcherComponent.new item: item, **@kwargs %>
+  <% end %>
+</div>
diff --git a/app/components/avo/tab_content_component.rb b/app/components/avo/tab_content_component.rb
new file mode 100644
index 0000000000..d1dab85b15
--- /dev/null
+++ b/app/components/avo/tab_content_component.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+class Avo::TabContentComponent < Avo::BaseComponent
+  prop :tab
+  prop :kwargs, kind: :**
+end
diff --git a/app/components/avo/tab_group_component.html.erb b/app/components/avo/tab_group_component.html.erb
index f14a7bd888..d5739d1f58 100644
--- a/app/components/avo/tab_group_component.html.erb
+++ b/app/components/avo/tab_group_component.html.erb
@@ -14,11 +14,17 @@
       <div class="border rounded-lg p-2 -mx-2 -my-2 lg:p-4 lg:-mx-4 lg:-my-3 space-y-4">
         <%= render Avo::TabSwitcherComponent.new resource: resource, current_tab: visible_tabs.first, group: group, active_tab_name: tab.name, view: view %>
         <% if !tab.is_empty? %>
-          <div class="space-y-12">
-            <% tab.visible_items.each do |item| %>
-              <%= render Avo::Items::SwitcherComponent.new resource: resource, item: item, index: index, form: form, view: @view %>
+          <% if tab.lazy_load && view.display? %>
+            <%= turbo_frame_tag tab.turbo_frame_id(parent: @group), **frame_args(tab) do %>
+              <% if is_not_loaded?(tab) %>
+                <%= render Avo::LoadingComponent.new(title: tab.name) %>
+              <% else %>
+                <%= render Avo::TabContentComponent.new tab:, resource:, index:, form:, view:%>
+              <% end %>
             <% end %>
-          </div>
+          <% else %>
+            <%= render Avo::TabContentComponent.new tab:, resource:, index:, form:, view:%>
+          <% end %>
         <% end %>
       </div>
     <% end %>
diff --git a/app/components/avo/tab_group_component.rb b/app/components/avo/tab_group_component.rb
index 730d6e4ea6..9fec095e0d 100644
--- a/app/components/avo/tab_group_component.rb
+++ b/app/components/avo/tab_group_component.rb
@@ -18,6 +18,30 @@ def render?
     tabs_have_content? && visible_tabs.present?
   end
 
+  def frame_args(tab)
+    args = {
+      target: :_top,
+      class: "block"
+    }
+
+    if is_not_loaded?(tab)
+      args[:loading] = :lazy
+      args[:src] = helpers.resource_path(
+        resource: @resource,
+        record: @resource.record,
+        keep_query_params: true,
+        active_tab_name: tab.name,
+        tab_turbo_frame: tab.turbo_frame_id(parent: @group)
+      )
+    end
+
+    args
+  end
+
+  def is_not_loaded?(tab)
+    params[:tab_turbo_frame] != tab.turbo_frame_id(parent: @group)
+  end
+
   def tabs_have_content?
     visible_tabs.present?
   end
diff --git a/app/components/avo/views/resource_edit_component.rb b/app/components/avo/views/resource_edit_component.rb
index 36cafac81d..9a5c4baccf 100644
--- a/app/components/avo/views/resource_edit_component.rb
+++ b/app/components/avo/views/resource_edit_component.rb
@@ -18,6 +18,9 @@ def title
   end
 
   def back_path
+    # The `return_to` param takes precedence over anything else.
+    return params[:return_to] if params[:return_to].present?
+
     return if via_belongs_to?
     return resource_view_path if via_resource?
     return resources_path if via_index?
diff --git a/app/components/avo/views/resource_index_component.html.erb b/app/components/avo/views/resource_index_component.html.erb
index 84bfe55c7a..25e56dc0f1 100644
--- a/app/components/avo/views/resource_index_component.html.erb
+++ b/app/components/avo/views/resource_index_component.html.erb
@@ -11,7 +11,7 @@
       description: description,
       cover_photo: resource.cover_photo,
       data: {component: "resources-index"},
-      display_breadcrumbs: @reflection.blank? || (@reflection.present? && !helpers.turbo_frame_request?)
+      display_breadcrumbs: (@reflection.blank? && @parent_resource.blank?) || (@reflection.present? && !helpers.turbo_frame_request?)
     ) do |c| %>
     <% c.with_name_slot do %>
       <%= render Avo::PanelNameComponent.new name: title, url: (params[:turbo_frame].present? && linkable?) ? field.frame_url(add_turbo_frame: false) : nil, target: :_blank do |panel_name_component| %>
diff --git a/app/components/avo/views/resource_index_component.rb b/app/components/avo/views/resource_index_component.rb
index 92122977e6..cd114e7998 100644
--- a/app/components/avo/views/resource_index_component.rb
+++ b/app/components/avo/views/resource_index_component.rb
@@ -40,6 +40,9 @@ def available_view_types
   # The Create button is dependent on the new? policy method.
   # The create? should be called only when the user clicks the Save button so the developers gets access to the params from the form.
   def can_see_the_create_button?
+    # Disable creation for ArrayResources
+    return false if @resource.resource_type_array?
+
     return authorize_association_for(:create) if @reflection.present?
 
     @resource.authorization.authorize_action(:new, raise_exception: false) && !has_reflection_and_is_read_only
@@ -171,6 +174,9 @@ def can_render_scopes?
   end
 
   def back_path
+    # The `return_to` param takes precedence over anything else.
+    return params[:return_to] if params[:return_to].present?
+
     # Show Go Back link only when association page is opened
     # as a standalone page
     if @reflection.present? && !helpers.turbo_frame_request?
diff --git a/app/components/avo/views/resource_show_component.html.erb b/app/components/avo/views/resource_show_component.html.erb
index a51bf0dff4..51ef8c7b97 100644
--- a/app/components/avo/views/resource_show_component.html.erb
+++ b/app/components/avo/views/resource_show_component.html.erb
@@ -27,7 +27,7 @@
     <turbo-stream action="append" target="alerts">
       <template>
         <% @resource.invalid_fields.each do |error| %>
-          <%= render Avo::AlertComponent.new :error, error[:message] %>
+          <%= render Avo::AlertComponent.new error[:alert_type], error[:message] %>
         <% end %>
       </template>
     </turbo-stream>
diff --git a/app/components/avo/views/resource_show_component.rb b/app/components/avo/views/resource_show_component.rb
index 33f255cc91..68db99918b 100644
--- a/app/components/avo/views/resource_show_component.rb
+++ b/app/components/avo/views/resource_show_component.rb
@@ -28,6 +28,9 @@ def title
   end
 
   def back_path
+    # The `return_to` param takes precedence over anything else.
+    return params[:return_to] if params[:return_to].present?
+
     if via_resource?
       helpers.resource_path(resource: association_resource, resource_id: params[:via_record_id])
     else
@@ -50,6 +53,9 @@ def edit_path
       {}
     end
 
+    # Pass the return_to param to the edit path so the chain of navigation is kept.
+    args[:return_to] = params[:return_to] if params[:return_to].present?
+
     helpers.edit_resource_path(record: @resource.record, resource: @resource, **args)
   end
 
diff --git a/app/controllers/avo/actions_controller.rb b/app/controllers/avo/actions_controller.rb
index 71389fe746..eb0cd67e44 100644
--- a/app/controllers/avo/actions_controller.rb
+++ b/app/controllers/avo/actions_controller.rb
@@ -9,9 +9,8 @@ class ActionsController < ApplicationController
       # set_record will fail if it's tried to be used from the Index page.
       request.params[:id].present?
     end
-    before_action :set_action, only: [:show, :handle]
-    before_action :verify_authorization, only: [:show, :handle]
-    before_action :set_query, :set_fields, only: :handle
+    before_action :set_query, :set_action, :verify_authorization, only: [:show, :handle]
+    before_action :set_fields, only: :handle
 
     layout :choose_layout
 
@@ -34,7 +33,7 @@ def build_background_url
       params = URI.decode_www_form(uri.query || "").to_h
 
       params.delete("action_id")
-      params[:turbo_frame] = ACTIONS_BACKGROUND_FRAME
+      params[:turbo_frame] = ACTIONS_BACKGROUND_FRAME_ID
 
       # Reconstruct the query string
       new_query_string = URI.encode_www_form(params)
@@ -62,7 +61,7 @@ def handle
     private
 
     def set_query
-      resource_ids = action_params[:fields][:avo_resource_ids].split(",")
+      resource_ids = action_params[:fields]&.dig(:avo_resource_ids)&.split(",") || []
 
       @query = decrypted_query || (resource_ids.any? ? @resource.find_record(resource_ids, params: params) : [])
     end
@@ -72,7 +71,7 @@ def set_fields
     end
 
     def action_params
-      @action_params ||= params.permit(:id, :authenticity_token, :resource_name, :action_id, :button, fields: {})
+      @action_params ||= params.permit(:id, :authenticity_token, :resource_name, :action_id, :button, :arguments, fields: {})
     end
 
     def set_action
@@ -82,7 +81,8 @@ def set_action
         user: _current_user,
         # force the action view to in order to render new-related fields (hidden field)
         view: Avo::ViewInquirer.new(:new),
-        arguments: BaseAction.decode_arguments(params[:arguments] || params.dig(:fields, :arguments)) || {}
+        arguments: BaseAction.decode_arguments(params[:arguments] || params.dig(:fields, :arguments)) || {},
+        query: @query
       )
 
       # Fetch action's fields
@@ -171,7 +171,7 @@ def get_messages
     end
 
     def decrypted_query
-      return if (encrypted_query = action_params[:fields][:avo_selected_query]).blank?
+      return if (encrypted_query = action_params[:fields]&.dig(:avo_selected_query)).blank?
 
       Avo::Services::EncryptionService.decrypt(message: encrypted_query, purpose: :select_all, serializer: Marshal)
     end
diff --git a/app/controllers/avo/array_controller.rb b/app/controllers/avo/array_controller.rb
new file mode 100644
index 0000000000..0b3332d34a
--- /dev/null
+++ b/app/controllers/avo/array_controller.rb
@@ -0,0 +1,7 @@
+module Avo
+  class ArrayController < BaseController
+    def set_query
+      @query ||= @resource.fetch_records
+    end
+  end
+end
diff --git a/app/controllers/avo/associations_controller.rb b/app/controllers/avo/associations_controller.rb
index 3dd24b3175..a7cea10acd 100644
--- a/app/controllers/avo/associations_controller.rb
+++ b/app/controllers/avo/associations_controller.rb
@@ -24,8 +24,20 @@ def index
       @resource = @related_resource
       @parent_record = @parent_resource.find_record(params[:id], params: params)
       @parent_resource.hydrate(record: @parent_record)
-      association_name = BaseResource.valid_association_name(@parent_record, association_from_params)
-      @query = @related_authorization.apply_policy @parent_record.send(association_name)
+
+      # When array field the records are fetched from the field block, from the parent record or from the resource def records
+      # When other field type, like has_many the @query is directly fetched from the parent record
+      # Don't apply policy on array type since it can return an array of hashes where `.all` and other methods used on policy will fail.
+      @query = if @field.type == "array"
+        @resource.fetch_records(Avo::ExecutionContext.new(target: @field.block).handle || @parent_record.try(@field.id))
+      else
+        @related_authorization.apply_policy(
+          @parent_record.send(
+            BaseResource.valid_association_name(@parent_record, association_from_params)
+          )
+        )
+      end
+
       @association_field = find_association_field(resource: @parent_resource, association: params[:related_name])
 
       if @association_field.present? && @association_field.scope.present?
@@ -125,7 +137,8 @@ def set_reflection
     end
 
     def set_attachment_class
-      @attachment_class = @reflection.klass
+      # @reflection is nil whe using an Array field.
+      @attachment_class = @reflection&.klass
     end
 
     def set_attachment_resource
diff --git a/app/controllers/avo/base_application_controller.rb b/app/controllers/avo/base_application_controller.rb
index 77bceae7b0..0df200e854 100644
--- a/app/controllers/avo/base_application_controller.rb
+++ b/app/controllers/avo/base_application_controller.rb
@@ -14,6 +14,7 @@ class BaseApplicationController < ::ActionController::Base
     include Avo::Concerns::FindAssociationField
 
     protect_from_forgery with: :exception
+    before_action :decode_params
     around_action :set_avo_locale
     around_action :set_force_locale, if: -> { params[:force_locale].present? }
     before_action :init_app
@@ -21,7 +22,6 @@ class BaseApplicationController < ::ActionController::Base
     before_action :set_resource_name
     before_action :_authenticate!
     before_action :set_authorization
-    before_action :set_container_classes
     before_action :add_initial_breadcrumbs
     before_action :set_view
     before_action :set_sidebar_open
@@ -30,7 +30,7 @@ class BaseApplicationController < ::ActionController::Base
     rescue_from Avo::NotAuthorizedError, with: :render_unauthorized
     rescue_from ActiveRecord::RecordInvalid, with: :exception_logger
 
-    helper_method :_current_user, :resources_path, :resource_path, :new_resource_path, :edit_resource_path, :resource_attach_path, :resource_detach_path, :related_resources_path, :turbo_frame_request?, :resource_view_path, :preview_resource_path
+    helper_method :_current_user, :resources_path, :resource_path, :new_resource_path, :edit_resource_path, :resource_attach_path, :resource_detach_path, :related_resources_path, :turbo_frame_request?, :resource_view_path, :preview_resource_path, :e
     add_flash_types :info, :warning, :success, :error
 
     def exception_logger(exception)
@@ -84,19 +84,6 @@ def resource
       Avo.resource_manager.get_resource_by_controller_name @resource_name
     end
 
-    def related_resource
-      # Find the field from the parent resource
-      field = find_association_field(resource: @resource, association: params[:related_name])
-
-      return field.use_resource if field&.use_resource.present?
-
-      reflection = @record.class.reflect_on_association(field&.for_attribute || params[:related_name])
-
-      reflected_model = reflection.klass
-
-      Avo.resource_manager.get_resource_by_model_class reflected_model
-    end
-
     def set_resource_name
       @resource_name = resource_name
     end
@@ -118,6 +105,11 @@ def detect_fields
     end
 
     def set_related_resource
+      # Find the field from the parent resource
+      related_resource = find_association_field(resource: @resource, association: params[:related_name])
+        .hydrate(record: @record)
+        .resource_class(params)
+
       raise Avo::MissingResourceError.new(related_resource_name) if related_resource.nil?
 
       action_view = action_name.to_sym
@@ -255,16 +247,8 @@ def set_authorization
       end
     end
 
-    def set_container_classes
-      contain = true
-
-      if Avo.configuration.full_width_container
-        contain = false
-      elsif Avo.configuration.full_width_index_view && action_name.to_sym == :index && self.class.superclass.to_s == "Avo::ResourcesController"
-        contain = false
-      end
-
-      @container_classes = contain ? "2xl:container 2xl:mx-auto" : ""
+    def mark_container_as_full_width
+      @container_full_width = true
     end
 
     def add_initial_breadcrumbs
@@ -339,5 +323,12 @@ def authenticate_developer_or_admin!
     def raise_404
       raise ActionController::RoutingError.new "No route matches"
     end
+
+    def decode_params
+      if params[:return_to].present?
+        params[:raw_return_to] = params[:return_to]
+        params[:return_to] = d(params[:return_to])
+      end
+    end
   end
 end
diff --git a/app/controllers/avo/base_controller.rb b/app/controllers/avo/base_controller.rb
index e21d0c2156..916ac0b2d8 100644
--- a/app/controllers/avo/base_controller.rb
+++ b/app/controllers/avo/base_controller.rb
@@ -28,11 +28,7 @@ def index
       set_index_params
       set_filters
       set_actions
-
-      # If we don't get a query object predefined from a child controller like associations, just spin one up
-      unless defined? @query
-        @query = @resource.class.query_scope
-      end
+      set_query
 
       # Eager load the associations
       if @resource.includes.present?
@@ -46,7 +42,7 @@ def index
         end
       end
 
-      apply_sorting
+      apply_sorting if @index_params[:sort_by]
 
       # Apply filters to the current query
       filters_to_be_applied.each do |filter_class, filter_value|
@@ -245,12 +241,16 @@ def perform_action_and_record_errors(&block)
       begin
         succeeded = block.call
       rescue ActiveRecord::RecordInvalid => error
+        log_error error
+
         # Do nothing as the record errors are already being displayed
         # On associations controller add errors from join record to record
         if controller_name == "associations"
           @record.errors.add(:base, error.message)
         end
       rescue => exception
+        log_error exception
+
         # In case there's an error somewhere else than the record
         # Example: When you save a license that should create a user for it and creating that user throws and error.
         # Example: When you Try to delete a record and has a foreign key constraint.
@@ -262,6 +262,13 @@ def perform_action_and_record_errors(&block)
       @record.errors.any? ? false : succeeded
     end
 
+    def log_error(error)
+      return if Rails.env.production?
+
+      Rails.logger.error error
+      Rails.logger.error error.backtrace.join("\n")
+    end
+
     def model_params
       request_params = params.require(model_param_key).permit(permitted_params)
 
@@ -310,18 +317,7 @@ def set_index_params
       set_pagination_params
 
       # Sorting
-      if params[:sort_by].present?
-        @index_params[:sort_by] = params[:sort_by]
-      elsif @resource.model_class.present?
-        available_columns = @resource.model_class.column_names
-        default_sort_column = @resource.default_sort_column
-
-        if available_columns.include?(default_sort_column.to_s)
-          @index_params[:sort_by] = default_sort_column
-        elsif available_columns.include?("created_at")
-          @index_params[:sort_by] = :created_at
-        end
-      end
+      @index_params[:sort_by] = params[:sort_by] || @resource.sort_by_param
 
       @index_params[:sort_direction] = params[:sort_direction] || @resource.default_sort_direction
 
@@ -506,6 +502,8 @@ def update_fail_message
     end
 
     def after_update_path
+      # The `return_to` param takes precedence over anything else.
+      return params[:return_to] if params[:return_to].present?
       return params[:referrer] if params[:referrer].present?
 
       redirect_path_from_resource_option(:after_update_path) || resource_view_response_path
@@ -554,12 +552,15 @@ def after_destroy_path
     def redirect_path_from_resource_option(action = :after_update_path)
       return nil if @resource.class.send(action).blank?
 
+      extra_args = {}
+      extra_args[:return_to] = params[:return_to] if params[:return_to].present?
+
       if @resource.class.send(action) == :index
-        resources_path(resource: @resource)
+        resources_path(resource: @resource, **extra_args)
       elsif @resource.class.send(action) == :edit || Avo.configuration.resource_default_view.edit?
-        edit_resource_path(resource: @resource, record: @resource.record)
+        edit_resource_path(resource: @resource, record: @resource.record, **extra_args)
       else
-        resource_path(record: @record, resource: @resource)
+        resource_path(record: @record, resource: @resource, **extra_args)
       end
     end
 
@@ -608,8 +609,6 @@ def apply_pagination
     end
 
     def apply_sorting
-      return if @index_params[:sort_by].nil?
-
       sort_by = @index_params[:sort_by].to_sym
       if sort_by != :created_at
         @query = @query.unscope(:order)
@@ -650,5 +649,10 @@ def set_pagination_params
 
       @index_params[:per_page] = cookies[:per_page] || Avo.configuration.per_page
     end
+
+    # If we don't get a query object predefined from a child controller like associations, just spin one up
+    def set_query
+      @query ||= @resource.class.query_scope
+    end
   end
 end
diff --git a/app/controllers/avo/media_library_controller.rb b/app/controllers/avo/media_library_controller.rb
new file mode 100644
index 0000000000..7e76be0343
--- /dev/null
+++ b/app/controllers/avo/media_library_controller.rb
@@ -0,0 +1,42 @@
+module Avo
+  class MediaLibraryController < ApplicationController
+    include Pagy::Backend
+    before_action :authorize_access!
+
+    def index
+      @attaching = false
+    end
+
+    def show
+      @blob = ActiveStorage::Blob.find(params[:id])
+    end
+
+    def destroy
+      @blob = ActiveStorage::Blob.find(params[:id])
+      @blob.destroy!
+
+      redirect_to avo.media_library_index_path
+    end
+
+    def update
+      @blob = ActiveStorage::Blob.find(params[:id])
+      @blob.update!(blob_params)
+    end
+
+    def attach
+      @attaching = true
+
+      render :index
+    end
+
+    private
+
+    def blob_params
+      params.require(:blob).permit(:filename, metadata: [:title, :alt, :description])
+    end
+
+    def authorize_access!
+      raise_404 if Avo::MediaLibrary.configuration.disabled?
+    end
+  end
+end
diff --git a/app/controllers/avo/search_controller.rb b/app/controllers/avo/search_controller.rb
index 1aa2840506..c358bac8c0 100644
--- a/app/controllers/avo/search_controller.rb
+++ b/app/controllers/avo/search_controller.rb
@@ -54,7 +54,9 @@ def search_resource(resource)
         return nil unless render_error?
 
         search_query_undefined = error_payload(
-          _label: "Please configure the search for #{resource}",
+          header: "⚠️ Warning ⚠️",
+          help: "",
+          _label: "Search is disabled for #{resource}.\n To enable it please use this guide...",
           _url: "https://docs.avohq.io/3.0/search.html#enable-search-for-a-resource"
         )
 
@@ -207,10 +209,15 @@ def render_error(...)
       }, status: 500
     end
 
-    def error_payload(_label:, _url: "")
+    def error_payload(
+      _label:,
+      _url: "",
+      header: "🚨 An error occurred during search 🚨",
+      help: "Please review and resolve the issue before deployment 🚨"
+    )
       {
-        header: "🚨 An error occurred during search 🚨",
-        help: "Please review and resolve the issue before deployment 🚨",
+        header:,
+        help:,
         results: {
           _label:,
           _url:,
diff --git a/app/controllers/concerns/avo/initializes_avo.rb b/app/controllers/concerns/avo/initializes_avo.rb
index 97032d50e2..047ce18be8 100644
--- a/app/controllers/concerns/avo/initializes_avo.rb
+++ b/app/controllers/concerns/avo/initializes_avo.rb
@@ -7,6 +7,12 @@ def init_app
       Avo::Current.view_context = view_context
       Avo.init
       Avo::Current.license = Licensing::LicenseManager.new(Licensing::HQ.new(request).response).license
+
+      # Output a warning in the logs if the license is invalid
+      if Avo::Current.license.invalid?
+        Avo.logger.debug "Your Avo license looks invalid. Please troubleshoot it using the directions here: https://docs.avohq.io/3.0/license-troubleshooting.html"
+      end
+
       Avo::Current.locale = locale
     end
 
diff --git a/app/helpers/avo/application_helper.rb b/app/helpers/avo/application_helper.rb
index d3bc0f216a..2ff816658c 100644
--- a/app/helpers/avo/application_helper.rb
+++ b/app/helpers/avo/application_helper.rb
@@ -145,6 +145,43 @@ def possibly_rails_authentication?
       defined?(Authentication) && Authentication.private_instance_methods.include?(:require_authentication) && Authentication.private_instance_methods.include?(:authenticated?)
     end
 
+    def pagy_major_version
+      return nil unless defined?(Pagy::VERSION)
+      version = Pagy::VERSION&.split(".")&.first&.to_i
+
+      return "8-or-more" if version >= 8
+
+      version
+    end
+
+    def container_is_full_width?
+      if @container_full_width.present?
+        @container_full_width
+      elsif Avo.configuration.full_width_container
+        true
+      elsif Avo.configuration.full_width_index_view && action_name.to_sym == :index && controller.class.superclass.to_s == "Avo::ResourcesController"
+        true
+      else
+        false
+      end
+    end
+
+    def container_classes
+      container_is_full_width? ? "" : "2xl:container 2xl:mx-auto"
+    end
+
+    # encode & encrypt params
+    def e(value)
+      Avo::Services::EncryptionService.encrypt(message: value, purpose: :return_to, serializer: Marshal)
+    end
+
+    # decrypt & decode params
+    def d(value)
+      Avo::Services::EncryptionService.decrypt(message: value, purpose: :return_to, serializer: Marshal)
+    rescue
+      value
+    end
+
     private
 
     # Taken from the original library
diff --git a/app/helpers/avo/resources_helper.rb b/app/helpers/avo/resources_helper.rb
index de16039368..54055f9abd 100644
--- a/app/helpers/avo/resources_helper.rb
+++ b/app/helpers/avo/resources_helper.rb
@@ -57,5 +57,18 @@ def resource_show_path(resource:, parent_resource: nil, parent_record: nil, pare
 
       resource_path(record: resource.record, resource: parent_or_child_resource, **args)
     end
+
+    def resource_for_record(record)
+      klass = Avo.resource_manager.get_resource_by_model_class(record.class)
+      klass.new(record: record)
+    end
+
+    def record_title(record)
+      resource_for_record(record).record_title
+    end
+
+    def record_path(record)
+      resource_for_record(record).record_path
+    end
   end
 end
diff --git a/app/javascript/avo.base.js b/app/javascript/avo.base.js
index 127aa9112c..e79868c5eb 100644
--- a/app/javascript/avo.base.js
+++ b/app/javascript/avo.base.js
@@ -22,7 +22,7 @@ window.Turbolinks = Turbo
 
 let scrollTop = null
 Mousetrap.bind('r r r', () => {
-  // Cpture scroll position
+  // Capture scroll position
   scrollTop = document.scrollingElement.scrollTop
 
   window.StreamActions.turbo_reload()
diff --git a/app/javascript/js/application.js b/app/javascript/js/application.js
index 986239cb83..b1f817d711 100644
--- a/app/javascript/js/application.js
+++ b/app/javascript/js/application.js
@@ -1,5 +1,5 @@
 import { Alert, Popover } from 'tailwindcss-stimulus-components'
-import { Application } from '@hotwired/stimulus'
+import { Application, Controller } from '@hotwired/stimulus'
 import Clipboard from '@stimulus-components/clipboard'
 import PasswordVisibility from '@stimulus-components/password-visibility'
 import TextareaAutogrow from 'stimulus-textarea-autogrow'
@@ -13,6 +13,22 @@ const application = Application.start()
 application.debug = window?.localStorage.getItem('avo.debug')
 window.Stimulus = application
 
+/* Using this patter of providing a fake Stimulus object so the plugins do not have to bundle the Stimulus controller too.
+   Their rollup config is isntructed to use `fakeStimulus` instead of `Stimulus`.
+   output: {
+   ...
+    globals: {
+      "@hotwired/stimulus": "FakeStimulus"
+    }
+  }
+
+  Example rollup config
+  https://github.com/avo-hq/marksmith/blob/main/rollup.config.mjs
+*/
+window.FakeStimulus = {
+  Controller,
+}
+
 // Register stimulus-components controller
 application.register('alert', Alert)
 application.register('popover', Popover)
diff --git a/app/javascript/js/controllers.js b/app/javascript/js/controllers.js
index 48ad154aee..3876d7104e 100644
--- a/app/javascript/js/controllers.js
+++ b/app/javascript/js/controllers.js
@@ -22,6 +22,8 @@ import ItemSelectAllController from './controllers/item_select_all_controller'
 import ItemSelectorController from './controllers/item_selector_controller'
 import KeyValueController from './controllers/fields/key_value_controller'
 import LoadingButtonController from './controllers/loading_button_controller'
+import MediaLibraryAttachController from './controllers/media_library_attach_controller'
+import MediaLibraryController from './controllers/media_library_controller'
 import MenuController from './controllers/menu_controller'
 import ModalController from './controllers/modal_controller'
 import MultipleSelectFilterController from './controllers/multiple_select_filter_controller'
@@ -68,6 +70,8 @@ application.register('input-autofocus', InputAutofocusController)
 application.register('item-select-all', ItemSelectAllController)
 application.register('item-selector', ItemSelectorController)
 application.register('loading-button', LoadingButtonController)
+application.register('media-library', MediaLibraryController)
+application.register('media-library-attach', MediaLibraryAttachController)
 application.register('menu', MenuController)
 application.register('modal', ModalController)
 application.register('multiple-select-filter', MultipleSelectFilterController)
diff --git a/app/javascript/js/controllers/copy_to_clipboard_controller.js b/app/javascript/js/controllers/copy_to_clipboard_controller.js
index 4ff80bf602..47d4e2551b 100644
--- a/app/javascript/js/controllers/copy_to_clipboard_controller.js
+++ b/app/javascript/js/controllers/copy_to_clipboard_controller.js
@@ -1,7 +1,10 @@
 import { Controller } from '@hotwired/stimulus'
 
+// Connects to data-controller="copy-to-clipboard"
+// <div data-controller="copy-to-clipboard" text="Hello, world!" data-action="click->copy-to-clipboard#copy"></div>
 export default class extends Controller {
-  copy() {
+  copy(event) {
+    event.preventDefault()
     const str = this.context.element.dataset.text
     /* ——— Derived from: https://hackernoon.com/copying-text-to-clipboard-with-javascript-df4d4988697f
           improved to add iOS device compatibility——— */
@@ -33,5 +36,15 @@ export default class extends Controller {
 
     el.contentEditable = storeContentEditable
     el.readOnly = storeReadOnly
+
+    const target = this.element
+    const originalHTML = target.innerHTML
+    target.innerHTML = 'Copied 👌'
+    target.classList.add('transition', 'opacity-80', 'bg-green-100')
+
+    setTimeout(() => {
+      target.innerHTML = originalHTML
+      target.classList.remove('opacity-80', 'bg-green-100')
+    }, 1500)
   }
 }
diff --git a/app/javascript/js/controllers/fields/trix_field_controller.js b/app/javascript/js/controllers/fields/trix_field_controller.js
index 9b9796c352..4156930a25 100644
--- a/app/javascript/js/controllers/fields/trix_field_controller.js
+++ b/app/javascript/js/controllers/fields/trix_field_controller.js
@@ -1,9 +1,14 @@
+/* eslint-disable no-console */
+/* eslint-disable camelcase */
 /* eslint-disable no-alert */
 import 'trix'
 import URI from 'urijs'
 
 import { Controller } from '@hotwired/stimulus'
 
+// eslint-disable-next-line max-len
+const galleryButtonSVG = '<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6"><path stroke-linecap="round" stroke-linejoin="round" d="m2.25 15.75 5.159-5.159a2.25 2.25 0 0 1 3.182 0l5.159 5.159m-1.5-1.5 1.409-1.409a2.25 2.25 0 0 1 3.182 0l2.909 2.909m-18 3.75h16.5a1.5 1.5 0 0 0 1.5-1.5V6a1.5 1.5 0 0 0-1.5-1.5H3.75A1.5 1.5 0 0 0 2.25 6v12a1.5 1.5 0 0 0 1.5 1.5Zm10.5-11.25h.008v.008h-.008V8.25Zm.375 0a.375.375 0 1 1-.75 0 .375.375 0 0 1 .75 0Z" /></svg>'
+
 export default class extends Controller {
   static targets = ['editor', 'controller']
 
@@ -21,63 +26,131 @@ export default class extends Controller {
     attachmentKeyWarning: String,
   }
 
+  get rootPath() {
+    return new URI(window.Avo.configuration.root_path)
+  }
+
   get uploadUrl() {
     // Parse the current URL
     const url = new URI(window.location.origin)
-    // Parse the root path
-    const rootPath = new URI(window.Avo.configuration.root_path)
     // Build the trix field path
-    url.path(`${rootPath.path()}/avo_api/resources/${this.resourceNameValue}/${this.resourceIdValue}/attachments`)
+    url.path(`${this.rootPath.path()}/avo_api/resources/${this.resourceNameValue}/${this.resourceIdValue}/attachments`)
     // Add the params back
-    url.query(rootPath.query())
+    url.query(this.rootPath.query())
 
     return url.toString()
   }
 
   connect() {
-    if (this.attachmentsDisabledValue) {
-      // Remove the attachments button
-      window.addEventListener('trix-initialize', (event) => {
-        if (event.target === this.editorTarget) {
-          this.controllerTarget.querySelector('.trix-button-group--file-tools').remove()
-        }
-      })
-    }
+    this.#attachTrixListeners()
+  }
 
-    window.addEventListener('trix-file-accept', (event) => {
-      if (event.target === this.editorTarget) {
-        // Prevent file uploads for fields that have attachments disabled.
-        if (this.attachmentsDisabledValue) {
-          event.preventDefault()
-          alert(this.attachmentDisableWarningValue)
+  disconnect() {
+    this.#removeTrixListeners()
+  }
 
-          return
-        }
+  // Invoked by the other controllers (media-library)
+  insertAttachments(attachments, event) {
+    if (!attachments) {
+      console.warning('[Avo->] No attachments present.')
 
-        // Prevent file uploads for resources that haven't been saved yet.
-        if (!this.resourceIdValue) {
-          event.preventDefault()
-          alert(this.uploadWarningValue)
+      return
+    }
 
-          return
-        }
+    attachments.forEach((attachment) => {
+      const { path, blob } = attachment
 
-        // Prevent file uploads for fields without an attachment key.
-        // When is rich text, attachment key is not needed.
-        if (!this.isActionTextValue && !this.attachmentKeyValue) {
-          event.preventDefault()
-          alert(this.attachmentKeyWarningValue)
-        }
+      const payload = {
+        url: path,
+        filename: blob.filename,
+        contentType: blob.content_type,
+        previewable: true,
       }
+
+      this.#injectAttachment(payload, event)
     })
+  }
+
+  // eslint-disable-next-line no-unused-vars
+  #injectAttachment(attachment, event) {
+    const model = new window.Trix.models.Attachment(attachment)
+    this.editorTarget.editorController.editor.insertAttachment(model)
+  }
 
-    window.addEventListener('trix-attachment-add', (event) => {
+  #removeTrixListeners() {
+    this.element.removeEventListener('trix-file-accept', this.#trixFileAccept.bind(this))
+    this.element.removeEventListener('trix-attachment-add', this.#trixAttachmentAdd.bind(this))
+    this.element.removeEventListener('trix-initialize', this.#trixInitialize.bind(this))
+  }
+
+  #attachTrixListeners() {
+    this.element.addEventListener('trix-file-accept', this.#trixFileAccept.bind(this))
+    this.element.addEventListener('trix-attachment-add', this.#trixAttachmentAdd.bind(this))
+    this.element.addEventListener('trix-initialize', this.#trixInitialize.bind(this))
+  }
+
+  #trixInitialize(event) {
+    // Remove the attachments button from the toolbar if the field has attachments disabled
+    if (this.attachmentsDisabledValue) {
       if (event.target === this.editorTarget) {
-        if (event.attachment.file) {
-          this.uploadFileAttachment(event.attachment)
-        }
+        this.controllerTarget.querySelector('.trix-button-group--file-tools').remove()
       }
-    })
+    }
+
+    const controllerElement = this.element.closest('[data-trix-field-target="controller"]')
+    const params = {
+      resource_name: this.resourceNameValue,
+      record_id: this.resourceIdValue,
+      controller_selector: controllerElement.dataset.trixFieldUniqueSelectorValue,
+      controller_name: this.identifier,
+    }
+
+    const mediaLibraryPath = new URI(`${this.rootPath.path()}/attach-media`)
+    mediaLibraryPath.addSearch(params)
+
+    // Add the gallery button to the toolbar
+    // const buttonHTML = `<button type="button" data-trix-action="gallery" class="trix-button trix-button--icon">${galleryButtonSVG}</button>`
+    const buttonHTML = `<a href="${mediaLibraryPath}" data-turbo-frame="${window.Avo.configuration.modal_frame_id}" class="trix-button trix-button--icon">${galleryButtonSVG}</a>`
+    if (window.Avo.configuration.media_library.visible && event.target.toolbarElement && event.target.toolbarElement.querySelector('.trix-button-group--file-tools')) {
+      event.target.toolbarElement
+        .querySelector('.trix-button-group--file-tools')
+        .insertAdjacentHTML('beforeend', buttonHTML)
+    }
+  }
+
+  #trixAttachmentAdd(event) {
+    if (event.target === this.editorTarget) {
+      if (event.attachment.file) {
+        this.uploadFileAttachment(event.attachment)
+      }
+    }
+  }
+
+  #trixFileAccept(event) {
+    if (event.target === this.editorTarget) {
+      // Prevent file uploads for fields that have attachments disabled.
+      if (this.attachmentsDisabledValue) {
+        event.preventDefault()
+        alert(this.attachmentDisableWarningValue)
+
+        return
+      }
+
+      // Prevent file uploads for resources that haven't been saved yet.
+      if (!this.resourceIdValue) {
+        event.preventDefault()
+        alert(this.uploadWarningValue)
+
+        return
+      }
+
+      // Prevent file uploads for fields without an attachment key.
+      // When is rich text, attachment key is not needed.
+      if (!this.isActionTextValue && !this.attachmentKeyValue) {
+        event.preventDefault()
+        alert(this.attachmentKeyWarningValue)
+      }
+    }
   }
 
   uploadFileAttachment(attachment) {
diff --git a/app/javascript/js/controllers/item_select_all_controller.js b/app/javascript/js/controllers/item_select_all_controller.js
index 2fac63cd4d..32164bfacc 100644
--- a/app/javascript/js/controllers/item_select_all_controller.js
+++ b/app/javascript/js/controllers/item_select_all_controller.js
@@ -69,6 +69,8 @@ export default class extends Controller {
       this.selectAllOverlay(allSelected)
       this.resetUnselected()
     }
+
+    this.updateLinks('resourceIds')
   }
 
   selectAll(event) {
@@ -77,6 +79,43 @@ export default class extends Controller {
     this.selectedAllValue = !this.selectedAllValue
     this.unselectedMessageTarget.classList.toggle('hidden')
     this.selectedMessageTarget.classList.toggle('hidden')
+
+    if (this.selectedAllValue) {
+      this.updateLinks('selectedQuery')
+    } else {
+      this.updateLinks('resourceIds')
+    }
+  }
+
+  updateLinks(param) {
+    let resourceIds = ''
+    let selectedQuery = ''
+
+    if (param === 'resourceIds') {
+      resourceIds = JSON.parse(this.element.dataset.selectedResources).join(',')
+    } else if (param === 'selectedQuery') {
+      selectedQuery = this.element.dataset.itemSelectAllSelectedAllQueryValue
+    }
+
+    document.querySelectorAll('[data-target="actions-list"] > a').forEach((link) => {
+      try {
+        const url = new URL(link.href)
+
+        Array.from(url.searchParams.keys())
+          .filter((key) => key.startsWith('fields['))
+          .forEach((key) => url.searchParams.delete(key))
+
+        if (param === 'resourceIds') {
+          url.searchParams.set('fields[avo_resource_ids]', resourceIds)
+        } else if (param === 'selectedQuery') {
+          url.searchParams.set('fields[avo_selected_query]', selectedQuery)
+        }
+
+        link.href = url.toString()
+      } catch (error) {
+        console.error('Error updating link:', link, error)
+      }
+    })
   }
 
   resetUnselected() {
diff --git a/app/javascript/js/controllers/item_selector_controller.js b/app/javascript/js/controllers/item_selector_controller.js
index 2c241edf59..5e5e7fc93c 100644
--- a/app/javascript/js/controllers/item_selector_controller.js
+++ b/app/javascript/js/controllers/item_selector_controller.js
@@ -44,15 +44,19 @@ export default class extends Controller {
 
     ids.push(this.resourceId)
 
-    // Mark the row as selected
-    this.element.closest('tr').classList.add('selected-row')
+    // Mark the row as selected if on table view
+    if (this.element.closest('tr')) {
+      this.element.closest('tr').classList.add('selected-row')
+    }
 
     this.currentIds = ids
   }
 
   removeFromSelected() {
-    // Un-mark the row as selected
-    this.element.closest('tr').classList.remove('selected-row')
+    // Un-mark the row as selected if on table view
+    if (this.element.closest('tr')) {
+      this.element.closest('tr').classList.remove('selected-row')
+    }
 
     this.currentIds = this.currentIds.filter(
       (item) => item.toString() !== this.resourceId,
@@ -71,19 +75,27 @@ export default class extends Controller {
 
   enableResourceActions() {
     this.actionLinks.forEach((link) => {
-      link.classList.add(link.dataset.enabledClasses)
-      link.classList.remove(link.dataset.disabledClasses)
-      link.setAttribute('data-href', link.getAttribute('href'))
-      link.dataset.disabled = false
+      // Enable only if is on the same resource context
+      // Avoiding to enable unrelated actions when selecting items on a has many table
+      if (link.dataset.resourceName === this.resourceName) {
+        link.classList.add(link.dataset.enabledClasses)
+        link.classList.remove(link.dataset.disabledClasses)
+        link.setAttribute('data-href', link.getAttribute('href'))
+        link.dataset.disabled = false
+      }
     })
   }
 
   disableResourceActions() {
     this.actionLinks.forEach((link) => {
-      link.classList.remove(link.dataset.enabledClasses)
-      link.classList.add(link.dataset.disabledClasses)
-      link.setAttribute('href', link.getAttribute('data-href'))
-      link.dataset.disabled = true
+      // Disable only if is on the same resource context
+      // Avoiding to disable unrelated actions when selecting items on a has many table
+      if (link.dataset.resourceName === this.resourceName) {
+        link.classList.remove(link.dataset.enabledClasses)
+        link.classList.add(link.dataset.disabledClasses)
+        link.setAttribute('href', link.getAttribute('data-href'))
+        link.dataset.disabled = true
+      }
     })
   }
 }
diff --git a/app/javascript/js/controllers/media_library_attach_controller.js b/app/javascript/js/controllers/media_library_attach_controller.js
new file mode 100644
index 0000000000..e740c47bdd
--- /dev/null
+++ b/app/javascript/js/controllers/media_library_attach_controller.js
@@ -0,0 +1,160 @@
+/* eslint-disable no-console */
+// eslint-disable-next-line max-classes-per-file
+import { Controller } from '@hotwired/stimulus'
+import { DirectUpload } from '@rails/activestorage'
+import { escape } from 'lodash'
+
+class UploadObject extends EventTarget {
+  constructor(file, controller) {
+    super()
+
+    this.file = file
+    this.controller = controller
+    this.finished = false
+  }
+
+  hasFinished() {
+    return this.finished
+  }
+
+  handle() {
+    const upload = new DirectUpload(this.file, this.controller.directUploadsUrlValue, this)
+
+    this.#addUploadingItem(this.file)
+
+    upload.create((error, blob) => {
+      if (error) {
+        console.log('Error', error)
+      }
+      this.listItem.classList.add('text-gray-400')
+
+      this.finished = true
+      this.dispatchEvent(new Event('done'))
+    })
+  }
+
+  #addUploadingItem(file) {
+    const div = document.createElement('div')
+    div.classList.add('flex', 'justify-between', 'gap-2', 'text-sm')
+    div.innerHTML = `<div>${escape(file.name)}</div><div class="progress">0%</div>`
+    this.listItem = this.controller.uploadingContainerTarget.appendChild(div)
+  }
+
+  directUploadWillStoreFileWithXHR(request) {
+    request.upload.addEventListener(
+      'progress',
+      (event) => this.#directUploadDidProgress(event),
+    )
+  }
+
+  #directUploadDidProgress(event) {
+    const progress = (event.loaded / event.total) * 100
+    const element = this.listItem.querySelector('.progress')
+    element.textContent = `${progress.toFixed(2)}%`
+  }
+}
+
+// Connects to data-controller="media-library-new"
+export default class extends Controller {
+  static targets = ['dropzone', 'uploadingContainer']
+
+  static values = {
+    directUploadsUrl: String,
+  }
+
+  dragCopy = 'drag file or click to upload'
+
+  dropCopy = "drop it like it's hot"
+
+  droppedCopy = 'uploading file. hang tight'
+
+  unsupportedCopy = 'wrong file type. try again'
+
+  draggingClasses = ['dropzone-dragging', '!border-gray-700', '!text-gray-700']
+
+  connect() {
+    this.attachHandlers()
+    this.setupFileInput()
+  }
+
+  setupFileInput() {
+    // Create a hidden file input element
+    this.fileInput = document.createElement('input')
+    this.fileInput.type = 'file'
+    this.fileInput.multiple = true
+    this.fileInput.style.display = 'none'
+    this.element.appendChild(this.fileInput)
+
+    // Handle file selection
+    this.fileInput.addEventListener('change', (e) => {
+      const files = Array.from(e.target.files)
+      this.#submitFiles(files)
+      this.fileInput.value = '' // Reset the input for future selections
+    })
+  }
+
+  triggerFileBrowser() {
+    this.fileInput.click()
+  }
+
+  attachHandlers() {
+    const vm = this
+
+    Array.from(['drag', 'dragstart', 'dragend', 'dragover', 'dragenter', 'dragleave', 'drop']).forEach((event) => {
+      vm.dropzoneTarget.addEventListener(event, (e) => {
+        e.preventDefault()
+        e.stopPropagation()
+      })
+    })
+
+    this.dropzoneTarget.addEventListener('dragover', (e) => {
+      vm.dragAction()
+    }, false)
+
+    this.dropzoneTarget.addEventListener('dragleave', (e) => {
+      vm.dropAction()
+    }, false)
+
+    this.dropzoneTarget.addEventListener('drop', (e) => {
+      vm.dropAction()
+      const { files } = e.dataTransfer
+      this.#submitFiles(files)
+    }, false)
+  }
+
+  #submitFiles(files) {
+    this.uploadObjects = []
+    Array.from(files).forEach((file) => {
+      const uploadObject = new UploadObject(file, this)
+      this.uploadObjects.push(uploadObject)
+      uploadObject.addEventListener('done', () => {
+        this.#checkIfAllFinished()
+      })
+      uploadObject.handle()
+    })
+  }
+
+  #checkIfAllFinished() {
+    if (this.uploadObjects.every((uploadObject) => uploadObject.hasFinished())) {
+      this.#refreshPage()
+    }
+  }
+
+  #refreshPage() {
+    const streamElement = document.createElement('turbo-stream')
+    streamElement.setAttribute('action', 'refresh')
+    streamElement.setAttribute('method', 'morph')
+    streamElement.setAttribute('render', 'morph')
+    this.element.appendChild(streamElement)
+  }
+
+  dragAction() {
+    this.dropzoneTarget.classList.add(...this.draggingClasses)
+    this.dropzoneTarget.innerHTML = this.dropCopy
+  }
+
+  dropAction() {
+    this.dropzoneTarget.classList.remove(...this.draggingClasses)
+    this.dropzoneTarget.innerHTML = this.droppedCopy
+  }
+}
diff --git a/app/javascript/js/controllers/media_library_controller.js b/app/javascript/js/controllers/media_library_controller.js
new file mode 100644
index 0000000000..21cdab5a7a
--- /dev/null
+++ b/app/javascript/js/controllers/media_library_controller.js
@@ -0,0 +1,89 @@
+/* eslint-disable no-console */
+import { Controller } from '@hotwired/stimulus'
+import { closeModal } from '../helpers'
+
+// Connects to data-controller="media-library"
+export default class extends Controller {
+  static outlets = ['field']
+
+  static values = {
+    itemDetailsFrameId: String,
+    controllerSelector: String,
+    controllerName: String,
+    selectedItems: Array,
+  }
+
+  // get the controller for the selector and name
+  get otherController() {
+    return this.application.getControllerForElementAndIdentifier(document.querySelector(this.controllerSelectorValue), this.controllerNameValue)
+  }
+
+  // get the controller for the selector and name
+  get modalController() {
+    return this.application.getControllerForElementAndIdentifier(document.querySelector('[data-controller="modal"]'), 'modal')
+  }
+
+  // selectItems(event) {
+  //   // Search the DOM for the media library list component
+  //   const mediaLibraryList = document.querySelector('[data-controller="media-library"]')
+
+  //   // Get the elements that have the data-selected attribute set to true
+  //   const selectedItems = mediaLibraryList.querySelectorAll('[data-selected="true"]')
+
+  //   // get the attachment and blob information from the selected items
+  //   const attachments = Array.from(selectedItems).map((item) => {
+  //     const attachment = JSON.parse(item.dataset.mediaLibraryAttachmentParam)
+  //     const blob = JSON.parse(item.dataset.mediaLibraryBlobParam)
+  //     const path = item.dataset.mediaLibraryPathParam
+
+  //     return { attachment, blob, path }
+  //   })
+
+  //   this.insertAttachments(attachments, event)
+  //   this.modalController.closeModal()
+  // }
+
+  selectItem(event) {
+    const { params } = event
+    const { attaching, multiple } = params
+    const item = event.target.closest('[data-component="avo/media_library/list_item_component"]')
+    const attachments = [this.#extractMetadataFromItem(item)]
+    // When attaching, we want to prevent showing the details screen and instead just check the attachment
+    if (attaching) {
+      event.preventDefault()
+      this.insertAttachments(attachments, event)
+      closeModal()
+
+      // TODO: allow multiple attachments
+      // if (multiple) {
+      //   const element = document.querySelector(`[data-attachment-id="${params.attachment.id}"]`)
+      //   element.dataset.selected = !(element.dataset.selected === 'true')
+      // } else {
+      //   this.insertAttachments(attachments, event)
+      // }
+    }
+  }
+
+  insertAttachments(attachments, event) {
+    // show an error if the controller is not found
+    if (!this.otherController) {
+      console.error(`[Avo->] The Media Library failed to find any field outlets to inject the asset. Tried selector: ${this.controllerSelectorValue} and name: ${this.controllerNameValue}`)
+
+      return
+    }
+    // Trigger the insertAttachment action on the other controller
+    this.otherController.insertAttachments(attachments, event)
+  }
+
+  closeItemDetails() {
+    document.querySelector(`turbo-frame#${this.itemDetailsFrameIdValue}`).innerHTML = ''
+  }
+
+  #extractMetadataFromItem(item) {
+    const blob = JSON.parse(item.dataset.mediaLibraryBlobParam)
+    const path = item.dataset.mediaLibraryPathParam
+    const url = item.dataset.mediaLibraryUrlParam
+
+    return { blob, path, url }
+  }
+}
diff --git a/app/javascript/js/controllers/modal_controller.js b/app/javascript/js/controllers/modal_controller.js
index f071983aa4..8d84d6f736 100644
--- a/app/javascript/js/controllers/modal_controller.js
+++ b/app/javascript/js/controllers/modal_controller.js
@@ -1,5 +1,6 @@
 import { Controller } from '@hotwired/stimulus'
 
+// Connects to data-controller="modal"
 export default class extends Controller {
   static targets = ['modal', 'backdrop']
 
@@ -7,11 +8,16 @@ export default class extends Controller {
     closeModalOnBackdropClick: true,
   }
 
-  close() {
+  close(event) {
     if (event.target === this.backdropTarget && !this.closeModalOnBackdropClickValue) return
 
+    this.closeModal()
+  }
+
+  // May be invoked by the other controllers
+  closeModal() {
     this.modalTarget.remove()
 
-    document.dispatchEvent(new Event('actions-modal:close'))
+    document.dispatchEvent(new Event('modal-controller:close'))
   }
 }
diff --git a/app/javascript/js/helpers/index.js b/app/javascript/js/helpers/index.js
new file mode 100644
index 0000000000..19c94e1b9f
--- /dev/null
+++ b/app/javascript/js/helpers/index.js
@@ -0,0 +1,5 @@
+const closeModal = () => {
+  document.querySelector(`turbo-frame#${window.Avo.configuration.modal_frame_id}`).innerHTML = ''
+}
+
+export { closeModal }
diff --git a/app/javascript/late-registration.js b/app/javascript/late-registration.js
new file mode 100644
index 0000000000..cda9bf934a
--- /dev/null
+++ b/app/javascript/late-registration.js
@@ -0,0 +1,8 @@
+const application = window.Stimulus
+
+// This is going run last so it can regiser custom StimulusJS controllers from plugins.
+if (window.Avo.configuration.stimulus_controllers) {
+  window.Avo.configuration.stimulus_controllers.forEach(([name, controller]) => {
+    application.register(name, window[controller])
+  })
+}
diff --git a/app/views/avo/actions/show.html.erb b/app/views/avo/actions/show.html.erb
index 9f8ef5ca61..d8ba706b7c 100644
--- a/app/views/avo/actions/show.html.erb
+++ b/app/views/avo/actions/show.html.erb
@@ -1,4 +1,4 @@
-<%= turbo_frame_tag Avo::ACTIONS_BACKGROUND_FRAME, src: @background_url, loading: :lazy, target: :_top, class: "block" do %>
+<%= turbo_frame_tag Avo::ACTIONS_BACKGROUND_FRAME_ID, src: @background_url, loading: :lazy, target: :_top, class: "block" do %>
   <%= render Avo::LoadingComponent.new(title: "...") %>
 <% end %>
 
diff --git a/app/views/avo/media_library/_form.html.erb b/app/views/avo/media_library/_form.html.erb
new file mode 100644
index 0000000000..ce3064d534
--- /dev/null
+++ b/app/views/avo/media_library/_form.html.erb
@@ -0,0 +1,40 @@
+<%= form_with model: @blob, url: avo.media_library_path(@blob), method: :patch, class: "pb-6" do |f| %>
+  <%= field_container do %>
+    <%= avo_edit_field :filename, as: :text, short: true, stacked: true, form: f, required: true %>
+    <%= f.fields_for :metadata do |meta_form| %>
+      <%= avo_edit_field :title,
+        as: :text,
+        value: @blob.metadata[:title],
+        short: true,
+        stacked: true,
+        form: meta_form,
+        required: true
+      %>
+      <%= avo_edit_field :alt,
+        as: :text,
+        value: @blob.metadata[:alt],
+        short: true,
+        stacked: true,
+        form: meta_form
+      %>
+      <%= avo_edit_field :description,
+        as: :textarea,
+        value: @blob.metadata[:description],
+        short: true,
+        stacked: true,
+        form: meta_form
+      %>
+    <% end %>
+  <% end %>
+
+  <div class="w-full flex justify-end pr-6">
+    <%= a_button type: :submit,
+      icon: "avo/save",
+      size: :sm,
+      style: :outline,
+      data: {
+      } do %>
+      Update
+    <% end %>
+  </div>
+<% end %>
diff --git a/app/views/avo/media_library/_information.html.erb b/app/views/avo/media_library/_information.html.erb
new file mode 100644
index 0000000000..21f2d075d1
--- /dev/null
+++ b/app/views/avo/media_library/_information.html.erb
@@ -0,0 +1,50 @@
+<div class="p-6">
+  <dl>
+    <dt>Filename:</dt>
+    <dd><%= @blob.filename %></dd>
+  </dl>
+  <dl>
+    <dt>Key:</dt>
+    <dd><%= @blob.key %></dd>
+  </dl>
+  <dl>
+    <dt>Content type:</dt>
+    <dd><%= @blob.content_type %></dd>
+  </dl>
+  <dl>
+    <dt>Size:</dt>
+      <dd><%= number_to_human_size(@blob.byte_size) %></dd>
+  </dl>
+  <dl>
+    <dt>Service name:</dt>
+    <dd><%= @blob.service_name %></dd>
+  </dl>
+  <dl>
+    <dt>Created at:</dt>
+    <dd><%= @blob.created_at %></dd>
+  </dl>
+  <dl>
+    <% if @blob.attachments.present? %>
+      <dt>Attached to:</dt>
+      <dd>
+        <% @blob.attachments.each do |attachment| %>
+          <%= link_to record_title(attachment.record), record_path(attachment.record) %>
+        <% end %>
+      </dd>
+    <% end %>
+  </dl>
+  <dl>
+    <dt>Type:</dt>
+    <dd><%= @blob.filename %></dd>
+  </dl>
+  <dl>
+    <dt>Metadata:</dt>
+    <dd class="block">
+      <% @blob.metadata.each do |key, value| %>
+        <div class="block">
+          <code><%= key %>: <%= value %></code>
+        </div>
+      <% end %>
+    </dd>
+  </dl>
+</div>
diff --git a/app/views/avo/media_library/index.html.erb b/app/views/avo/media_library/index.html.erb
new file mode 100644
index 0000000000..aef9076e22
--- /dev/null
+++ b/app/views/avo/media_library/index.html.erb
@@ -0,0 +1,9 @@
+<%= render Avo::TurboFrameWrapperComponent.new(turbo_frame_request_id) do %>
+  <% if turbo_frame_request_id %>
+    <%= render Avo::ModalComponent.new do |c| %>
+      <%= render Avo::MediaLibrary::ListComponent.new attaching: @attaching %>
+    <% end %>
+  <% else %>
+    <%= render Avo::MediaLibrary::ListComponent.new attaching: @attaching %>
+  <% end %>
+<% end %>
diff --git a/app/views/avo/media_library/show.html.erb b/app/views/avo/media_library/show.html.erb
new file mode 100644
index 0000000000..dae6705382
--- /dev/null
+++ b/app/views/avo/media_library/show.html.erb
@@ -0,0 +1,5 @@
+<%= render Avo::PanelComponent.new title: t("avo.media_library.title") do |c| %>
+  <%= c.with_body do %>
+    <%= render Avo::MediaLibrary::ItemDetailsComponent.new(blob: @blob) %>
+  <% end %>
+<% end %>
diff --git a/app/views/avo/partials/_javascript.html.erb b/app/views/avo/partials/_javascript.html.erb
index 006bc03db1..a83a7e1d4f 100644
--- a/app/views/avo/partials/_javascript.html.erb
+++ b/app/views/avo/partials/_javascript.html.erb
@@ -12,4 +12,9 @@
   }
   <% end %>
   Avo.configuration.modal_frame_id = '<%= ::Avo::MODAL_FRAME_ID %>'
+  Avo.configuration.stimulus_controllers = []
+  Avo.configuration.media_library = {
+    enabled: <%= Avo::MediaLibrary.configuration.enabled? %>,
+    visible: <%= Avo::MediaLibrary.configuration.visible? %>
+  }
 <% end %>
diff --git a/app/views/avo/partials/_table_header.html.erb b/app/views/avo/partials/_table_header.html.erb
index f3dd5bc61c..fc43015ec5 100644
--- a/app/views/avo/partials/_table_header.html.erb
+++ b/app/views/avo/partials/_table_header.html.erb
@@ -20,7 +20,7 @@
       <% end %>
     </th>
   <% end %>
-  <% if @resource.resource_controls_render_on_the_left? %>
+  <% if @resource.render_row_controls_on_the_left? %>
     <th class="max-w-24" data-control="resource-controls-th">
       <!-- Item controls cell -->
     </th>
@@ -28,9 +28,10 @@
   <% fields.each_with_index do |field, index|  %>
     <%
       first_option = Avo.configuration.first_sorting_option.to_s
-      second_option = first_option == "desc" ? "asc" : "desc"
 
       if params[:sort_by] == field.id.to_s
+        second_option = first_option == "desc" ? "asc" : "desc"
+
         if params[:sort_direction] == second_option
           sort_by = nil
         else
@@ -65,7 +66,7 @@
       } do %>
       <%= content_tag :div,
         class: "relative flex items-center justify-between w-full" do %>
-        <% if field.sortable %>
+        <% if field.sortable && @resource.sorting_supported? %>
           <%= link_to params.permit!.merge(sort_by: sort_by, sort_direction: sort_direction),
             class: class_names("flex-1 flex justify-between", text_classes),
             'data-turbo-frame': params[:turbo_frame] do %>
@@ -105,7 +106,7 @@
       <% end %>
     <% end %>
   <% end %>
-  <% if @resource.resource_controls_render_on_the_right? %>
+  <% if @resource.render_row_controls_on_the_right? %>
     <th class="w-px max-w-24" data-control="resource-controls-th">
       <!-- Item controls cell -->
     </th>
diff --git a/app/views/layouts/avo/application.html.erb b/app/views/layouts/avo/application.html.erb
index cc0d0ba1eb..00dad64f8e 100644
--- a/app/views/layouts/avo/application.html.erb
+++ b/app/views/layouts/avo/application.html.erb
@@ -13,20 +13,20 @@
     <%= render partial: "avo/partials/branding" %>
     <%= render partial: "avo/partials/pre_head" %>
     <%= render Avo::AssetManager::StylesheetComponent.new asset_manager: Avo.asset_manager %>
-    <%= stylesheet_link_tag @stylesheet_assets_path, "data-turbo-track": "reload", defer: true, as: "style" %>
-    <% if Avo::PACKED %>
-      <%= javascript_include_tag "/avo-assets/avo.base", "data-turbo-track": "reload", defer: true %>
-    <% else %>
-      <%= javascript_include_tag "avo.base", "data-turbo-track": "reload", defer: true %>
-      <% if Rails.env.development? && defined?(Hotwire::Livereload) %>
-        <%= javascript_include_tag "hotwire-livereload", defer: true %>
-      <% end %>
+    <%= stylesheet_link_tag @stylesheet_assets_path, "data-turbo-track": "reload", as: "style" %>
+
+    <% path = Avo::PACKED ? "/avo-assets/avo.base" : "avo.base" %>
+    <%= javascript_include_tag path, "data-turbo-track": "reload", defer: true %>
+
+    <% if !Avo::PACKED && defined?(Hotwire::Livereload) %>
+      <%= javascript_include_tag "hotwire-livereload", defer: true %>
     <% end %>
+
     <%= render Avo::AssetManager::JavascriptComponent.new asset_manager: Avo.asset_manager %>
     <%= render partial: "avo/partials/head" %>
     <%= content_for :head %>
   </head>
-  <body class="bg-application os-mac">
+  <body class="bg-application os-mac floating-controls">
     <div class="relative flex flex-1 w-full min-h-full" data-controller="sidebar" data-sidebar-open-value="<%= @sidebar_open %>">
       <div class="flex-1 flex flex-col max-w-full">
         <%= render partial: "avo/partials/navbar", locals: { resource: @resource } %>
@@ -38,7 +38,7 @@
             <%= render Avo::SidebarComponent.new sidebar_open: false, for_mobile: true %>
           </div>
           <div class="main-content-area flex-1 flex flex-col min-h-full max-w-full">
-            <div class="content p-4 lg:p-6 flex-1 flex flex-col justify-between items-stretch <%= @container_classes %>">
+            <div class="content p-4 lg:p-6 flex-1 flex flex-col justify-between items-stretch <%= container_classes %>">
               <%= render partial: "avo/partials/custom_tools_alert" %>
               <div class="flex flex-1 flex-col justify-between items-stretch space-y-8">
                 <%= yield.force_encoding("UTF-8") %>
diff --git a/config/initializers/pagy.rb b/config/initializers/pagy.rb
index 584d9a69b8..f5fe824a7d 100644
--- a/config/initializers/pagy.rb
+++ b/config/initializers/pagy.rb
@@ -1,5 +1,6 @@
 require "pagy/extras/trim"
 require "pagy/extras/countless"
+require "pagy/extras/array"
 if ::Pagy::VERSION >= ::Gem::Version.new("9.0")
   require "pagy/extras/size"
 end
diff --git a/config/routes.rb b/config/routes.rb
index e5480b2117..41afeb9569 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -9,6 +9,9 @@
     instance_exec(&Avo.mount_engines)
   end
 
+  resources :media_library, only: [:index, :show, :update, :destroy], path: "media-library"
+  get "attach-media", to: "media_library#attach"
+
   post "/rails/active_storage/direct_uploads", to: "/active_storage/direct_uploads#create"
 
   scope "avo_api", as: "avo_api" do
diff --git a/db/factories.rb b/db/factories.rb
index a9541adbd6..15cc6c10de 100644
--- a/db/factories.rb
+++ b/db/factories.rb
@@ -37,7 +37,7 @@
 
   factory :project do
     name { Faker::App.name }
-    status { ['closed', :rejected, :failed, 'loading', :running, :waiting].sample }
+    status { ["closed", :rejected, :failed, "loading", :running, :waiting].sample }
     stage { ["Discovery", "Idea", "Done", "On hold", "Cancelled", "Drafting"].sample }
     budget { Faker::Number.decimal(l_digits: 4) }
     country { Faker::Address.country_code }
diff --git a/db/migrate/20250103192051_add_sizes_to_products.rb b/db/migrate/20250103192051_add_sizes_to_products.rb
new file mode 100644
index 0000000000..012f84f74c
--- /dev/null
+++ b/db/migrate/20250103192051_add_sizes_to_products.rb
@@ -0,0 +1,5 @@
+class AddSizesToProducts < ActiveRecord::Migration[6.1]
+  def change
+    add_column :products, :sizes, :string, array: true, default: []
+  end
+end
diff --git a/gemfiles/rails_6.1_ruby_3.1.4.gemfile b/gemfiles/rails_6.1_ruby_3.1.4.gemfile
index 3efa925762..8c202a90a5 100644
--- a/gemfiles/rails_6.1_ruby_3.1.4.gemfile
+++ b/gemfiles/rails_6.1_ruby_3.1.4.gemfile
@@ -38,6 +38,7 @@ gem "sprockets-rails"
 gem "image_processing", "~> 1.12"
 gem "prefixed_ids"
 gem "mapkick-rb", "~> 0.1.4"
+gem "mapkick-static"
 gem "pluggy", path: "../pluggy"
 gem "hashid-rails", "~> 1.4", ">= 1.4.1"
 gem "money-rails", "~> 1.12"
@@ -46,6 +47,7 @@ gem "avo-record_link_field"
 gem "pagy", "> 8"
 gem "csv"
 gem "psych", "< 4"
+gem "concurrent-ruby", "1.3.4"
 
 group :development do
   gem "standard", require: false
diff --git a/gemfiles/rails_6.1_ruby_3.1.4.gemfile.lock b/gemfiles/rails_6.1_ruby_3.1.4.gemfile.lock
index ff5b510e1d..748406f3a3 100644
--- a/gemfiles/rails_6.1_ruby_3.1.4.gemfile.lock
+++ b/gemfiles/rails_6.1_ruby_3.1.4.gemfile.lock
@@ -6,7 +6,7 @@ PATH
 PATH
   remote: ..
   specs:
-    avo (3.16.1)
+    avo (3.17.6)
       actionview (>= 6.1)
       active_link_to
       activerecord (>= 6.1)
@@ -94,10 +94,12 @@ GEM
     acts_as_list (1.2.4)
       activerecord (>= 6.1)
       activesupport (>= 6.1)
-    actual_db_schema (0.8.0)
+    actual_db_schema (0.8.2)
       activerecord
       activesupport
+      ast
       csv
+      parser
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     amazing_print (1.7.2)
@@ -113,20 +115,21 @@ GEM
       money-rails (~> 1.12)
     avo-record_link_field (0.0.2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.1033.0)
-    aws-sdk-core (3.214.1)
+    aws-partitions (1.1050.0)
+    aws-sdk-core (3.218.1)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
+      base64
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.96.0)
-      aws-sdk-core (~> 3, >= 3.210.0)
+    aws-sdk-kms (1.98.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.177.0)
-      aws-sdk-core (~> 3, >= 3.210.0)
+    aws-sdk-s3 (1.180.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.10.1)
+    aws-sigv4 (1.11.0)
       aws-eventstream (~> 1, >= 1.0.2)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
@@ -160,14 +163,14 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    chartkick (5.1.2)
+    chartkick (5.1.3)
     childprocess (5.1.0)
       logger (~> 1.5)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
     concurrent-ruby (1.3.4)
     connection_pool (2.5.0)
-    countries (7.1.0)
+    countries (7.1.1)
       unaccent (~> 0.3)
     crack (1.0.0)
       bigdecimal
@@ -208,7 +211,7 @@ GEM
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    diff-lcs (1.5.1)
+    diff-lcs (1.6.0)
     docile (1.4.1)
     dotenv (3.1.7)
     dotenv-rails (3.1.7)
@@ -236,17 +239,16 @@ GEM
       dry-logic (>= 1.4, < 2)
       dry-types (>= 1.7, < 2)
       zeitwerk (~> 2.6)
-    dry-types (1.8.0)
+    dry-types (1.8.2)
       bigdecimal (~> 3.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 1.0)
       dry-inflector (~> 1.0)
       dry-logic (~> 1.4)
       zeitwerk (~> 2.6)
-    e2mmap (0.1.0)
     erb-formatter (0.7.3)
       syntax_tree (~> 6.0)
-    erb_lint (0.8.0)
+    erb_lint (0.9.0)
       activesupport
       better_html (>= 2.0.1)
       parser (>= 2.7.1.4)
@@ -255,8 +257,8 @@ GEM
       smart_properties
     erubi (1.13.1)
     event_stream_parser (1.0.0)
-    factory_bot (6.5.0)
-      activesupport (>= 5.0.0)
+    factory_bot (6.5.1)
+      activesupport (>= 6.1.0)
     factory_bot_rails (6.4.4)
       factory_bot (~> 6.5)
       railties (>= 5.0.0)
@@ -314,7 +316,7 @@ GEM
       listen (>= 3.0.0)
       railties (>= 6.0.0)
     htmlbeautifier (1.4.3)
-    i18n (1.14.6)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     i18n-tasks (1.0.14)
       activesupport (>= 4.0.2)
@@ -327,14 +329,15 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       terminal-table (>= 1.5.1)
     ice_nine (0.11.2)
-    image_processing (1.13.0)
-      mini_magick (>= 4.9.5, < 5)
+    image_processing (1.14.0)
+      mini_magick (>= 4.9.5, < 6)
       ruby-vips (>= 2.0.17, < 3)
     inline_svg (1.10.0)
       activesupport (>= 3.0)
       nokogiri (>= 1.6)
     io-console (0.8.0)
-    irb (1.14.3)
+    irb (1.15.1)
+      pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     iso (0.4.0)
@@ -343,20 +346,21 @@ GEM
     jmespath (1.6.2)
     jsbundling-rails (1.3.1)
       railties (>= 6.0.0)
-    json (2.9.1)
+    json (2.10.1)
     kramdown (2.5.1)
       rexml (>= 3.3.9)
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    language_server-protocol (3.17.0.3)
-    launchy (3.0.1)
+    language_server-protocol (3.17.0.4)
+    launchy (3.1.0)
       addressable (~> 2.8)
       childprocess (~> 5.0)
+      logger (~> 1.6)
     lint_roller (1.1.0)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.6.4)
+    logger (1.6.5)
     loofah (2.24.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -366,6 +370,7 @@ GEM
       net-pop
       net-smtp
     mapkick-rb (0.1.5)
+    mapkick-static (0.1.1)
     marcel (1.0.4)
     matrix (0.4.2)
     memory_profiler (1.1.0)
@@ -373,7 +378,9 @@ GEM
       actionpack (>= 6.0.0, < 8.1)
     method_source (1.1.0)
     mini_histogram (0.3.1)
-    mini_magick (4.13.2)
+    mini_magick (5.1.2)
+      benchmark
+      logger
     mini_mime (1.1.5)
     minitest (5.25.4)
     monetize (1.13.0)
@@ -385,44 +392,49 @@ GEM
       monetize (~> 1.9)
       money (~> 6.13)
       railties (>= 3.0)
-    msgpack (1.7.5)
+    msgpack (1.8.0)
     multipart-post (2.4.1)
     net-http (0.6.0)
       uri
-    net-imap (0.5.5)
+    net-imap (0.5.6)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.5.0)
+    net-smtp (0.5.1)
       net-protocol
     nio4r (2.7.4)
-    nokogiri (1.18.1-arm64-darwin)
+    nokogiri (1.18.2-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.1-x86_64-linux-gnu)
+    nokogiri (1.18.2-x86_64-linux-gnu)
       racc (~> 1.4)
+    observer (0.1.2)
     orm_adapter (0.5.0)
+    ostruct (0.6.1)
     pagy (9.3.3)
     parallel (1.26.3)
-    parser (3.3.6.0)
+    parser (3.3.7.1)
       ast (~> 2.4.1)
       racc
     path_expander (1.1.3)
     pg (1.5.9)
+    pp (0.6.2)
+      prettyprint
     prefixed_ids (1.8.1)
       hashids (>= 1.0.0, < 2.0.0)
       rails (>= 6.0.0)
     prettier_print (1.2.1)
+    prettyprint (0.2.0)
     prop_initializer (0.2.0)
       zeitwerk (>= 2.6.18)
     psych (3.3.4)
     public_suffix (6.0.1)
-    puma (6.5.0)
+    puma (6.6.0)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (2.2.10)
+    rack (2.2.11)
     rack-test (2.2.0)
       rack (>= 1.3)
     rails (6.1.7.10)
@@ -462,21 +474,23 @@ GEM
       thor (~> 1.0)
     rainbow (3.1.1)
     rake (13.2.1)
-    ransack (4.2.1)
+    ransack (4.3.0)
       activerecord (>= 6.1.5)
       activesupport (>= 6.1.5)
       i18n
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rbs (2.8.4)
+    rbs (3.8.1)
+      logger
     rdoc (6.3.4.1)
     redis (5.3.0)
       redis-client (>= 0.22.0)
-    redis-client (0.23.0)
+    redis-client (0.23.2)
       connection_pool
-    reek (6.3.0)
+    reek (6.4.0)
       dry-schema (~> 1.13.0)
+      logger (~> 1.6)
       parser (~> 3.3.0)
       rainbow (>= 2.0, < 4.0)
       rexml (~> 3.1)
@@ -486,11 +500,11 @@ GEM
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
-    reverse_markdown (2.1.1)
+    reverse_markdown (3.0.0)
       nokogiri
     rexml (3.4.0)
     ripper-tags (1.0.2)
-    rspec-core (3.13.2)
+    rspec-core (3.13.3)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -509,30 +523,30 @@ GEM
     rspec-retry (0.6.2)
       rspec-core (> 3.3)
     rspec-support (3.13.2)
-    rubocop (1.69.2)
+    rubocop (1.71.2)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.36.2, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.37.0)
+    rubocop-ast (1.38.0)
       parser (>= 3.3.1.0)
     rubocop-performance (1.23.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-shopify (2.15.1)
       rubocop (~> 1.51)
-    ruby-openai (7.3.1)
+    ruby-openai (7.4.0)
       event_stream_parser (>= 0.3.0, < 2.0.0)
       faraday (>= 1)
       faraday-multipart (>= 1)
     ruby-progressbar (1.13.0)
     ruby-statistics (3.0.2)
-    ruby-vips (2.2.2)
+    ruby-vips (2.2.3)
       ffi (~> 1.12)
       logger
     ruby_parser (3.21.1)
@@ -562,18 +576,20 @@ GEM
     simplecov-lcov (0.8.0)
     simplecov_json_formatter (0.1.4)
     smart_properties (1.17.0)
-    solargraph (0.50.0)
+    solargraph (0.51.2)
       backport (~> 1.2)
       benchmark
       bundler (~> 2.0)
       diff-lcs (~> 1.4)
-      e2mmap
-      jaro_winkler (~> 1.5)
+      jaro_winkler (~> 1.6)
       kramdown (~> 2.3)
       kramdown-parser-gfm (~> 1.1)
+      logger (~> 1.6)
+      observer (~> 0.1)
+      ostruct (~> 0.6)
       parser (~> 3.0)
-      rbs (~> 2.0)
-      reverse_markdown (~> 2.0)
+      rbs (~> 3.0)
+      reverse_markdown (>= 2.0, < 4)
       rubocop (~> 1.38)
       thor (~> 1.0)
       tilt (~> 2.0)
@@ -591,10 +607,10 @@ GEM
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       sprockets (>= 3.0.0)
-    standard (1.43.0)
+    standard (1.45.0)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)
-      rubocop (~> 1.69.1)
+      rubocop (~> 1.71.0)
       standard-custom (~> 1.0.0)
       standard-performance (~> 1.6)
     standard-custom (1.0.2)
@@ -605,12 +621,12 @@ GEM
       rubocop-performance (~> 1.23.0)
     syntax_tree (6.2.0)
       prettier_print (>= 1.2.0)
-    terminal-table (3.0.2)
-      unicode-display_width (>= 1.1.1, < 3)
+    terminal-table (4.0.0)
+      unicode-display_width (>= 1.1.1, < 4)
     test-prof (1.4.4)
     thor (1.3.2)
     thread_safe (0.3.6)
-    tilt (2.5.0)
+    tilt (2.6.0)
     timeout (0.4.3)
     tty-which (0.5.0)
     turbo-rails (2.0.11)
@@ -621,7 +637,9 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unaccent (0.4.0)
-    unicode-display_width (2.6.0)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
     uri (1.0.2)
     view_component (3.21.0)
       activesupport (>= 5.2.0, < 8.1)
@@ -638,7 +656,7 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webmock (3.24.0)
+    webmock (3.25.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -676,6 +694,7 @@ DEPENDENCIES
   bundler-integrity (~> 1.0)
   capybara
   chartkick
+  concurrent-ruby (= 1.3.4)
   countries
   cssbundling-rails
   csv
@@ -704,6 +723,7 @@ DEPENDENCIES
   launchy
   listen (>= 3.5.1)
   mapkick-rb (~> 0.1.4)
+  mapkick-static
   meta-tags
   money-rails (~> 1.12)
   net-smtp
diff --git a/gemfiles/rails_6.1_ruby_3.3.0.gemfile b/gemfiles/rails_6.1_ruby_3.3.0.gemfile
index 3efa925762..8c202a90a5 100644
--- a/gemfiles/rails_6.1_ruby_3.3.0.gemfile
+++ b/gemfiles/rails_6.1_ruby_3.3.0.gemfile
@@ -38,6 +38,7 @@ gem "sprockets-rails"
 gem "image_processing", "~> 1.12"
 gem "prefixed_ids"
 gem "mapkick-rb", "~> 0.1.4"
+gem "mapkick-static"
 gem "pluggy", path: "../pluggy"
 gem "hashid-rails", "~> 1.4", ">= 1.4.1"
 gem "money-rails", "~> 1.12"
@@ -46,6 +47,7 @@ gem "avo-record_link_field"
 gem "pagy", "> 8"
 gem "csv"
 gem "psych", "< 4"
+gem "concurrent-ruby", "1.3.4"
 
 group :development do
   gem "standard", require: false
diff --git a/gemfiles/rails_6.1_ruby_3.3.0.gemfile.lock b/gemfiles/rails_6.1_ruby_3.3.0.gemfile.lock
index cdb920bd98..1dc46ee855 100644
--- a/gemfiles/rails_6.1_ruby_3.3.0.gemfile.lock
+++ b/gemfiles/rails_6.1_ruby_3.3.0.gemfile.lock
@@ -6,7 +6,7 @@ PATH
 PATH
   remote: ..
   specs:
-    avo (3.16.1)
+    avo (3.17.6)
       actionview (>= 6.1)
       active_link_to
       activerecord (>= 6.1)
@@ -94,10 +94,12 @@ GEM
     acts_as_list (1.2.4)
       activerecord (>= 6.1)
       activesupport (>= 6.1)
-    actual_db_schema (0.8.0)
+    actual_db_schema (0.8.2)
       activerecord
       activesupport
+      ast
       csv
+      parser
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     amazing_print (1.7.2)
@@ -113,20 +115,21 @@ GEM
       money-rails (~> 1.12)
     avo-record_link_field (0.0.2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.1033.0)
-    aws-sdk-core (3.214.1)
+    aws-partitions (1.1050.0)
+    aws-sdk-core (3.218.1)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
+      base64
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.96.0)
-      aws-sdk-core (~> 3, >= 3.210.0)
+    aws-sdk-kms (1.98.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.177.0)
-      aws-sdk-core (~> 3, >= 3.210.0)
+    aws-sdk-s3 (1.180.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.10.1)
+    aws-sigv4 (1.11.0)
       aws-eventstream (~> 1, >= 1.0.2)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
@@ -160,14 +163,14 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    chartkick (5.1.2)
+    chartkick (5.1.3)
     childprocess (5.1.0)
       logger (~> 1.5)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
     concurrent-ruby (1.3.4)
     connection_pool (2.5.0)
-    countries (7.1.0)
+    countries (7.1.1)
       unaccent (~> 0.3)
     crack (1.0.0)
       bigdecimal
@@ -208,16 +211,15 @@ GEM
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    diff-lcs (1.5.1)
+    diff-lcs (1.6.0)
     docile (1.4.1)
     dotenv (3.1.7)
     dotenv-rails (3.1.7)
       dotenv (= 3.1.7)
       railties (>= 6.1)
-    e2mmap (0.1.0)
     erb-formatter (0.7.3)
       syntax_tree (~> 6.0)
-    erb_lint (0.8.0)
+    erb_lint (0.9.0)
       activesupport
       better_html (>= 2.0.1)
       parser (>= 2.7.1.4)
@@ -226,8 +228,8 @@ GEM
       smart_properties
     erubi (1.13.1)
     event_stream_parser (1.0.0)
-    factory_bot (6.5.0)
-      activesupport (>= 5.0.0)
+    factory_bot (6.5.1)
+      activesupport (>= 6.1.0)
     factory_bot_rails (6.4.4)
       factory_bot (~> 6.5)
       railties (>= 5.0.0)
@@ -285,7 +287,7 @@ GEM
       listen (>= 3.0.0)
       railties (>= 6.0.0)
     htmlbeautifier (1.4.3)
-    i18n (1.14.6)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     i18n-tasks (1.0.14)
       activesupport (>= 4.0.2)
@@ -298,14 +300,15 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       terminal-table (>= 1.5.1)
     ice_nine (0.11.2)
-    image_processing (1.13.0)
-      mini_magick (>= 4.9.5, < 5)
+    image_processing (1.14.0)
+      mini_magick (>= 4.9.5, < 6)
       ruby-vips (>= 2.0.17, < 3)
     inline_svg (1.10.0)
       activesupport (>= 3.0)
       nokogiri (>= 1.6)
     io-console (0.8.0)
-    irb (1.14.3)
+    irb (1.15.1)
+      pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     iso (0.4.0)
@@ -314,21 +317,22 @@ GEM
     jmespath (1.6.2)
     jsbundling-rails (1.3.1)
       railties (>= 6.0.0)
-    json (2.9.1)
+    json (2.10.1)
     kramdown (2.5.1)
       rexml (>= 3.3.9)
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     kwalify (0.7.2)
-    language_server-protocol (3.17.0.3)
-    launchy (3.0.1)
+    language_server-protocol (3.17.0.4)
+    launchy (3.1.0)
       addressable (~> 2.8)
       childprocess (~> 5.0)
+      logger (~> 1.6)
     lint_roller (1.1.0)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.6.4)
+    logger (1.6.5)
     loofah (2.24.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -338,6 +342,7 @@ GEM
       net-pop
       net-smtp
     mapkick-rb (0.1.5)
+    mapkick-static (0.1.1)
     marcel (1.0.4)
     matrix (0.4.2)
     memory_profiler (1.1.0)
@@ -345,7 +350,9 @@ GEM
       actionpack (>= 6.0.0, < 8.1)
     method_source (1.1.0)
     mini_histogram (0.3.1)
-    mini_magick (4.13.2)
+    mini_magick (5.1.2)
+      benchmark
+      logger
     mini_mime (1.1.5)
     minitest (5.25.4)
     monetize (1.13.0)
@@ -357,25 +364,27 @@ GEM
       monetize (~> 1.9)
       money (~> 6.13)
       railties (>= 3.0)
-    msgpack (1.7.5)
+    msgpack (1.8.0)
     multipart-post (2.4.1)
     net-http (0.6.0)
       uri
-    net-imap (0.5.5)
+    net-imap (0.5.6)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.5.0)
+    net-smtp (0.5.1)
       net-protocol
     nio4r (2.7.4)
-    nokogiri (1.18.1-arm64-darwin)
+    nokogiri (1.18.2-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.1-x86_64-linux-gnu)
+    nokogiri (1.18.2-x86_64-linux-gnu)
       racc (~> 1.4)
+    observer (0.1.2)
     orm_adapter (0.5.0)
+    ostruct (0.6.1)
     pagy (9.3.3)
     parallel (1.26.3)
     parser (3.2.2.4)
@@ -383,18 +392,21 @@ GEM
       racc
     path_expander (1.1.3)
     pg (1.5.9)
+    pp (0.6.2)
+      prettyprint
     prefixed_ids (1.8.1)
       hashids (>= 1.0.0, < 2.0.0)
       rails (>= 6.0.0)
     prettier_print (1.2.1)
+    prettyprint (0.2.0)
     prop_initializer (0.2.0)
       zeitwerk (>= 2.6.18)
     psych (3.3.4)
     public_suffix (6.0.1)
-    puma (6.5.0)
+    puma (6.6.0)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (2.2.10)
+    rack (2.2.11)
     rack-test (2.2.0)
       rack (>= 1.3)
     rails (6.1.7.10)
@@ -434,18 +446,19 @@ GEM
       thor (~> 1.0)
     rainbow (3.1.1)
     rake (13.2.1)
-    ransack (4.2.1)
+    ransack (4.3.0)
       activerecord (>= 6.1.5)
       activesupport (>= 6.1.5)
       i18n
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rbs (2.8.4)
+    rbs (3.8.1)
+      logger
     rdoc (6.3.4.1)
     redis (5.3.0)
       redis-client (>= 0.22.0)
-    redis-client (0.23.0)
+    redis-client (0.23.2)
       connection_pool
     reek (6.1.4)
       kwalify (~> 0.7.0)
@@ -457,11 +470,11 @@ GEM
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
-    reverse_markdown (2.1.1)
+    reverse_markdown (3.0.0)
       nokogiri
     rexml (3.4.0)
     ripper-tags (1.0.2)
-    rspec-core (3.13.2)
+    rspec-core (3.13.3)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -498,13 +511,13 @@ GEM
       rubocop-ast (>= 1.30.0, < 2.0)
     rubocop-shopify (2.15.1)
       rubocop (~> 1.51)
-    ruby-openai (7.3.1)
+    ruby-openai (7.4.0)
       event_stream_parser (>= 0.3.0, < 2.0.0)
       faraday (>= 1)
       faraday-multipart (>= 1)
     ruby-progressbar (1.13.0)
     ruby-statistics (3.0.2)
-    ruby-vips (2.2.2)
+    ruby-vips (2.2.3)
       ffi (~> 1.12)
       logger
     ruby_parser (3.21.1)
@@ -534,18 +547,20 @@ GEM
     simplecov-lcov (0.8.0)
     simplecov_json_formatter (0.1.4)
     smart_properties (1.17.0)
-    solargraph (0.50.0)
+    solargraph (0.51.2)
       backport (~> 1.2)
       benchmark
       bundler (~> 2.0)
       diff-lcs (~> 1.4)
-      e2mmap
-      jaro_winkler (~> 1.5)
+      jaro_winkler (~> 1.6)
       kramdown (~> 2.3)
       kramdown-parser-gfm (~> 1.1)
+      logger (~> 1.6)
+      observer (~> 0.1)
+      ostruct (~> 0.6)
       parser (~> 3.0)
-      rbs (~> 2.0)
-      reverse_markdown (~> 2.0)
+      rbs (~> 3.0)
+      reverse_markdown (>= 2.0, < 4)
       rubocop (~> 1.38)
       thor (~> 1.0)
       tilt (~> 2.0)
@@ -577,12 +592,12 @@ GEM
       rubocop-performance (~> 1.20.2)
     syntax_tree (6.2.0)
       prettier_print (>= 1.2.0)
-    terminal-table (3.0.2)
-      unicode-display_width (>= 1.1.1, < 3)
+    terminal-table (4.0.0)
+      unicode-display_width (>= 1.1.1, < 4)
     test-prof (1.4.4)
     thor (1.3.2)
     thread_safe (0.3.6)
-    tilt (2.5.0)
+    tilt (2.6.0)
     timeout (0.4.3)
     tty-which (0.5.0)
     turbo-rails (2.0.11)
@@ -610,7 +625,7 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webmock (3.24.0)
+    webmock (3.25.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -648,6 +663,7 @@ DEPENDENCIES
   bundler-integrity (~> 1.0)
   capybara
   chartkick
+  concurrent-ruby (= 1.3.4)
   countries
   cssbundling-rails
   csv
@@ -676,6 +692,7 @@ DEPENDENCIES
   launchy
   listen (>= 3.5.1)
   mapkick-rb (~> 0.1.4)
+  mapkick-static
   meta-tags
   money-rails (~> 1.12)
   net-smtp
diff --git a/gemfiles/rails_7.1_ruby_3.1.4.gemfile b/gemfiles/rails_7.1_ruby_3.1.4.gemfile
index fa6cf77d06..0c1832a059 100644
--- a/gemfiles/rails_7.1_ruby_3.1.4.gemfile
+++ b/gemfiles/rails_7.1_ruby_3.1.4.gemfile
@@ -38,6 +38,7 @@ gem "sprockets-rails"
 gem "image_processing", "~> 1.12"
 gem "prefixed_ids"
 gem "mapkick-rb", "~> 0.1.4"
+gem "mapkick-static"
 gem "pluggy", path: "../pluggy"
 gem "hashid-rails", "~> 1.4", ">= 1.4.1"
 gem "money-rails", "~> 1.12"
diff --git a/gemfiles/rails_7.1_ruby_3.1.4.gemfile.lock b/gemfiles/rails_7.1_ruby_3.1.4.gemfile.lock
index 11e68b0520..17fc588859 100644
--- a/gemfiles/rails_7.1_ruby_3.1.4.gemfile.lock
+++ b/gemfiles/rails_7.1_ruby_3.1.4.gemfile.lock
@@ -6,7 +6,7 @@ PATH
 PATH
   remote: ..
   specs:
-    avo (3.16.1)
+    avo (3.17.6)
       actionview (>= 6.1)
       active_link_to
       activerecord (>= 6.1)
@@ -107,10 +107,12 @@ GEM
     acts_as_list (1.2.4)
       activerecord (>= 6.1)
       activesupport (>= 6.1)
-    actual_db_schema (0.8.0)
+    actual_db_schema (0.8.2)
       activerecord
       activesupport
+      ast
       csv
+      parser
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     amazing_print (1.7.2)
@@ -126,20 +128,21 @@ GEM
       money-rails (~> 1.12)
     avo-record_link_field (0.0.2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.1033.0)
-    aws-sdk-core (3.214.1)
+    aws-partitions (1.1050.0)
+    aws-sdk-core (3.218.1)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
+      base64
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.96.0)
-      aws-sdk-core (~> 3, >= 3.210.0)
+    aws-sdk-kms (1.98.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.177.0)
-      aws-sdk-core (~> 3, >= 3.210.0)
+    aws-sdk-s3 (1.180.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.10.1)
+    aws-sigv4 (1.11.0)
       aws-eventstream (~> 1, >= 1.0.2)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
@@ -173,14 +176,14 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    chartkick (5.1.2)
+    chartkick (5.1.3)
     childprocess (5.1.0)
       logger (~> 1.5)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    concurrent-ruby (1.3.4)
+    concurrent-ruby (1.3.5)
     connection_pool (2.5.0)
-    countries (7.1.0)
+    countries (7.1.1)
       unaccent (~> 0.3)
     crack (1.0.0)
       bigdecimal
@@ -221,7 +224,7 @@ GEM
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    diff-lcs (1.5.1)
+    diff-lcs (1.6.0)
     docile (1.4.1)
     dotenv (3.1.7)
     dotenv-rails (3.1.7)
@@ -250,17 +253,16 @@ GEM
       dry-logic (>= 1.4, < 2)
       dry-types (>= 1.7, < 2)
       zeitwerk (~> 2.6)
-    dry-types (1.8.0)
+    dry-types (1.8.2)
       bigdecimal (~> 3.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 1.0)
       dry-inflector (~> 1.0)
       dry-logic (~> 1.4)
       zeitwerk (~> 2.6)
-    e2mmap (0.1.0)
     erb-formatter (0.7.3)
       syntax_tree (~> 6.0)
-    erb_lint (0.8.0)
+    erb_lint (0.9.0)
       activesupport
       better_html (>= 2.0.1)
       parser (>= 2.7.1.4)
@@ -269,8 +271,8 @@ GEM
       smart_properties
     erubi (1.13.1)
     event_stream_parser (1.0.0)
-    factory_bot (6.5.0)
-      activesupport (>= 5.0.0)
+    factory_bot (6.5.1)
+      activesupport (>= 6.1.0)
     factory_bot_rails (6.4.4)
       factory_bot (~> 6.5)
       railties (>= 5.0.0)
@@ -328,7 +330,7 @@ GEM
       listen (>= 3.0.0)
       railties (>= 6.0.0)
     htmlbeautifier (1.4.3)
-    i18n (1.14.6)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     i18n-tasks (1.0.14)
       activesupport (>= 4.0.2)
@@ -341,14 +343,15 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       terminal-table (>= 1.5.1)
     ice_nine (0.11.2)
-    image_processing (1.13.0)
-      mini_magick (>= 4.9.5, < 5)
+    image_processing (1.14.0)
+      mini_magick (>= 4.9.5, < 6)
       ruby-vips (>= 2.0.17, < 3)
     inline_svg (1.10.0)
       activesupport (>= 3.0)
       nokogiri (>= 1.6)
     io-console (0.8.0)
-    irb (1.14.3)
+    irb (1.15.1)
+      pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     iso (0.4.0)
@@ -357,20 +360,21 @@ GEM
     jmespath (1.6.2)
     jsbundling-rails (1.3.1)
       railties (>= 6.0.0)
-    json (2.9.1)
+    json (2.10.1)
     kramdown (2.5.1)
       rexml (>= 3.3.9)
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    language_server-protocol (3.17.0.3)
-    launchy (3.0.1)
+    language_server-protocol (3.17.0.4)
+    launchy (3.1.0)
       addressable (~> 2.8)
       childprocess (~> 5.0)
+      logger (~> 1.6)
     lint_roller (1.1.0)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.6.4)
+    logger (1.6.5)
     loofah (2.24.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -380,6 +384,7 @@ GEM
       net-pop
       net-smtp
     mapkick-rb (0.1.5)
+    mapkick-static (0.1.1)
     marcel (1.0.4)
     matrix (0.4.2)
     memory_profiler (1.1.0)
@@ -387,7 +392,9 @@ GEM
       actionpack (>= 6.0.0, < 8.1)
     method_source (1.1.0)
     mini_histogram (0.3.1)
-    mini_magick (4.13.2)
+    mini_magick (5.1.2)
+      benchmark
+      logger
     mini_mime (1.1.5)
     minitest (5.25.4)
     monetize (1.13.0)
@@ -399,44 +406,49 @@ GEM
       monetize (~> 1.9)
       money (~> 6.13)
       railties (>= 3.0)
-    msgpack (1.7.5)
+    msgpack (1.8.0)
     multipart-post (2.4.1)
     net-http (0.6.0)
       uri
-    net-imap (0.5.5)
+    net-imap (0.5.6)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.5.0)
+    net-smtp (0.5.1)
       net-protocol
     nio4r (2.7.4)
-    nokogiri (1.18.1-arm64-darwin)
+    nokogiri (1.18.2-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.1-x86_64-linux-gnu)
+    nokogiri (1.18.2-x86_64-linux-gnu)
       racc (~> 1.4)
+    observer (0.1.2)
     orm_adapter (0.5.0)
+    ostruct (0.6.1)
     pagy (9.3.3)
     parallel (1.26.3)
-    parser (3.3.6.0)
+    parser (3.3.7.1)
       ast (~> 2.4.1)
       racc
     path_expander (1.1.3)
     pg (1.5.9)
+    pp (0.6.2)
+      prettyprint
     prefixed_ids (1.8.1)
       hashids (>= 1.0.0, < 2.0.0)
       rails (>= 6.0.0)
     prettier_print (1.2.1)
+    prettyprint (0.2.0)
     prop_initializer (0.2.0)
       zeitwerk (>= 2.6.18)
     psych (3.3.4)
     public_suffix (6.0.1)
-    puma (6.5.0)
+    puma (6.6.0)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (3.1.8)
+    rack (3.1.10)
     rack-session (2.1.0)
       base64 (>= 0.1.0)
       rack (>= 3.0.0)
@@ -482,21 +494,23 @@ GEM
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
     rake (13.2.1)
-    ransack (4.2.1)
+    ransack (4.3.0)
       activerecord (>= 6.1.5)
       activesupport (>= 6.1.5)
       i18n
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rbs (2.8.4)
+    rbs (3.8.1)
+      logger
     rdoc (6.3.4.1)
     redis (5.3.0)
       redis-client (>= 0.22.0)
-    redis-client (0.23.0)
+    redis-client (0.23.2)
       connection_pool
-    reek (6.3.0)
+    reek (6.4.0)
       dry-schema (~> 1.13.0)
+      logger (~> 1.6)
       parser (~> 3.3.0)
       rainbow (>= 2.0, < 4.0)
       rexml (~> 3.1)
@@ -506,11 +520,11 @@ GEM
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
-    reverse_markdown (2.1.1)
+    reverse_markdown (3.0.0)
       nokogiri
     rexml (3.4.0)
     ripper-tags (1.0.2)
-    rspec-core (3.13.2)
+    rspec-core (3.13.3)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -529,30 +543,30 @@ GEM
     rspec-retry (0.6.2)
       rspec-core (> 3.3)
     rspec-support (3.13.2)
-    rubocop (1.69.2)
+    rubocop (1.71.2)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.36.2, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.37.0)
+    rubocop-ast (1.38.0)
       parser (>= 3.3.1.0)
     rubocop-performance (1.23.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-shopify (2.15.1)
       rubocop (~> 1.51)
-    ruby-openai (7.3.1)
+    ruby-openai (7.4.0)
       event_stream_parser (>= 0.3.0, < 2.0.0)
       faraday (>= 1)
       faraday-multipart (>= 1)
     ruby-progressbar (1.13.0)
     ruby-statistics (3.0.2)
-    ruby-vips (2.2.2)
+    ruby-vips (2.2.3)
       ffi (~> 1.12)
       logger
     ruby_parser (3.21.1)
@@ -583,18 +597,20 @@ GEM
     simplecov-lcov (0.8.0)
     simplecov_json_formatter (0.1.4)
     smart_properties (1.17.0)
-    solargraph (0.50.0)
+    solargraph (0.51.2)
       backport (~> 1.2)
       benchmark
       bundler (~> 2.0)
       diff-lcs (~> 1.4)
-      e2mmap
-      jaro_winkler (~> 1.5)
+      jaro_winkler (~> 1.6)
       kramdown (~> 2.3)
       kramdown-parser-gfm (~> 1.1)
+      logger (~> 1.6)
+      observer (~> 0.1)
+      ostruct (~> 0.6)
       parser (~> 3.0)
-      rbs (~> 2.0)
-      reverse_markdown (~> 2.0)
+      rbs (~> 3.0)
+      reverse_markdown (>= 2.0, < 4)
       rubocop (~> 1.38)
       thor (~> 1.0)
       tilt (~> 2.0)
@@ -612,10 +628,10 @@ GEM
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       sprockets (>= 3.0.0)
-    standard (1.43.0)
+    standard (1.45.0)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)
-      rubocop (~> 1.69.1)
+      rubocop (~> 1.71.0)
       standard-custom (~> 1.0.0)
       standard-performance (~> 1.6)
     standard-custom (1.0.2)
@@ -626,12 +642,12 @@ GEM
       rubocop-performance (~> 1.23.0)
     syntax_tree (6.2.0)
       prettier_print (>= 1.2.0)
-    terminal-table (3.0.2)
-      unicode-display_width (>= 1.1.1, < 3)
+    terminal-table (4.0.0)
+      unicode-display_width (>= 1.1.1, < 4)
     test-prof (1.4.4)
     thor (1.3.2)
     thread_safe (0.3.6)
-    tilt (2.5.0)
+    tilt (2.6.0)
     timeout (0.4.3)
     tty-which (0.5.0)
     turbo-rails (2.0.11)
@@ -642,7 +658,9 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unaccent (0.4.0)
-    unicode-display_width (2.6.0)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
     uri (1.0.2)
     useragent (0.16.11)
     view_component (3.21.0)
@@ -660,7 +678,7 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webmock (3.24.0)
+    webmock (3.25.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -726,6 +744,7 @@ DEPENDENCIES
   launchy
   listen (>= 3.5.1)
   mapkick-rb (~> 0.1.4)
+  mapkick-static
   meta-tags
   money-rails (~> 1.12)
   net-smtp
diff --git a/gemfiles/rails_7.1_ruby_3.3.0.gemfile b/gemfiles/rails_7.1_ruby_3.3.0.gemfile
index fa6cf77d06..0c1832a059 100644
--- a/gemfiles/rails_7.1_ruby_3.3.0.gemfile
+++ b/gemfiles/rails_7.1_ruby_3.3.0.gemfile
@@ -38,6 +38,7 @@ gem "sprockets-rails"
 gem "image_processing", "~> 1.12"
 gem "prefixed_ids"
 gem "mapkick-rb", "~> 0.1.4"
+gem "mapkick-static"
 gem "pluggy", path: "../pluggy"
 gem "hashid-rails", "~> 1.4", ">= 1.4.1"
 gem "money-rails", "~> 1.12"
diff --git a/gemfiles/rails_7.1_ruby_3.3.0.gemfile.lock b/gemfiles/rails_7.1_ruby_3.3.0.gemfile.lock
index c2049a0fb0..b16453ad51 100644
--- a/gemfiles/rails_7.1_ruby_3.3.0.gemfile.lock
+++ b/gemfiles/rails_7.1_ruby_3.3.0.gemfile.lock
@@ -6,7 +6,7 @@ PATH
 PATH
   remote: ..
   specs:
-    avo (3.16.1)
+    avo (3.17.6)
       actionview (>= 6.1)
       active_link_to
       activerecord (>= 6.1)
@@ -107,10 +107,12 @@ GEM
     acts_as_list (1.2.4)
       activerecord (>= 6.1)
       activesupport (>= 6.1)
-    actual_db_schema (0.8.0)
+    actual_db_schema (0.8.2)
       activerecord
       activesupport
+      ast
       csv
+      parser
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     amazing_print (1.7.2)
@@ -126,20 +128,21 @@ GEM
       money-rails (~> 1.12)
     avo-record_link_field (0.0.2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.1033.0)
-    aws-sdk-core (3.214.1)
+    aws-partitions (1.1050.0)
+    aws-sdk-core (3.218.1)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
+      base64
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.96.0)
-      aws-sdk-core (~> 3, >= 3.210.0)
+    aws-sdk-kms (1.98.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.177.0)
-      aws-sdk-core (~> 3, >= 3.210.0)
+    aws-sdk-s3 (1.180.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.10.1)
+    aws-sigv4 (1.11.0)
       aws-eventstream (~> 1, >= 1.0.2)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
@@ -173,14 +176,14 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    chartkick (5.1.2)
+    chartkick (5.1.3)
     childprocess (5.1.0)
       logger (~> 1.5)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    concurrent-ruby (1.3.4)
+    concurrent-ruby (1.3.5)
     connection_pool (2.5.0)
-    countries (7.1.0)
+    countries (7.1.1)
       unaccent (~> 0.3)
     crack (1.0.0)
       bigdecimal
@@ -221,17 +224,16 @@ GEM
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    diff-lcs (1.5.1)
+    diff-lcs (1.6.0)
     docile (1.4.1)
     dotenv (3.1.7)
     dotenv-rails (3.1.7)
       dotenv (= 3.1.7)
       railties (>= 6.1)
     drb (2.2.1)
-    e2mmap (0.1.0)
     erb-formatter (0.7.3)
       syntax_tree (~> 6.0)
-    erb_lint (0.8.0)
+    erb_lint (0.9.0)
       activesupport
       better_html (>= 2.0.1)
       parser (>= 2.7.1.4)
@@ -240,8 +242,8 @@ GEM
       smart_properties
     erubi (1.13.1)
     event_stream_parser (1.0.0)
-    factory_bot (6.5.0)
-      activesupport (>= 5.0.0)
+    factory_bot (6.5.1)
+      activesupport (>= 6.1.0)
     factory_bot_rails (6.4.4)
       factory_bot (~> 6.5)
       railties (>= 5.0.0)
@@ -299,7 +301,7 @@ GEM
       listen (>= 3.0.0)
       railties (>= 6.0.0)
     htmlbeautifier (1.4.3)
-    i18n (1.14.6)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     i18n-tasks (1.0.14)
       activesupport (>= 4.0.2)
@@ -312,14 +314,15 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       terminal-table (>= 1.5.1)
     ice_nine (0.11.2)
-    image_processing (1.13.0)
-      mini_magick (>= 4.9.5, < 5)
+    image_processing (1.14.0)
+      mini_magick (>= 4.9.5, < 6)
       ruby-vips (>= 2.0.17, < 3)
     inline_svg (1.10.0)
       activesupport (>= 3.0)
       nokogiri (>= 1.6)
     io-console (0.8.0)
-    irb (1.14.3)
+    irb (1.15.1)
+      pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     iso (0.4.0)
@@ -328,21 +331,22 @@ GEM
     jmespath (1.6.2)
     jsbundling-rails (1.3.1)
       railties (>= 6.0.0)
-    json (2.9.1)
+    json (2.10.1)
     kramdown (2.5.1)
       rexml (>= 3.3.9)
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     kwalify (0.7.2)
-    language_server-protocol (3.17.0.3)
-    launchy (3.0.1)
+    language_server-protocol (3.17.0.4)
+    launchy (3.1.0)
       addressable (~> 2.8)
       childprocess (~> 5.0)
+      logger (~> 1.6)
     lint_roller (1.1.0)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.6.4)
+    logger (1.6.5)
     loofah (2.24.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -352,6 +356,7 @@ GEM
       net-pop
       net-smtp
     mapkick-rb (0.1.5)
+    mapkick-static (0.1.1)
     marcel (1.0.4)
     matrix (0.4.2)
     memory_profiler (1.1.0)
@@ -359,7 +364,9 @@ GEM
       actionpack (>= 6.0.0, < 8.1)
     method_source (1.1.0)
     mini_histogram (0.3.1)
-    mini_magick (4.13.2)
+    mini_magick (5.1.2)
+      benchmark
+      logger
     mini_mime (1.1.5)
     minitest (5.25.4)
     monetize (1.13.0)
@@ -371,25 +378,27 @@ GEM
       monetize (~> 1.9)
       money (~> 6.13)
       railties (>= 3.0)
-    msgpack (1.7.5)
+    msgpack (1.8.0)
     multipart-post (2.4.1)
     net-http (0.6.0)
       uri
-    net-imap (0.5.5)
+    net-imap (0.5.6)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.5.0)
+    net-smtp (0.5.1)
       net-protocol
     nio4r (2.7.4)
-    nokogiri (1.18.1-arm64-darwin)
+    nokogiri (1.18.2-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.1-x86_64-linux-gnu)
+    nokogiri (1.18.2-x86_64-linux-gnu)
       racc (~> 1.4)
+    observer (0.1.2)
     orm_adapter (0.5.0)
+    ostruct (0.6.1)
     pagy (9.3.3)
     parallel (1.26.3)
     parser (3.2.2.4)
@@ -397,18 +406,21 @@ GEM
       racc
     path_expander (1.1.3)
     pg (1.5.9)
+    pp (0.6.2)
+      prettyprint
     prefixed_ids (1.8.1)
       hashids (>= 1.0.0, < 2.0.0)
       rails (>= 6.0.0)
     prettier_print (1.2.1)
+    prettyprint (0.2.0)
     prop_initializer (0.2.0)
       zeitwerk (>= 2.6.18)
     psych (3.3.4)
     public_suffix (6.0.1)
-    puma (6.5.0)
+    puma (6.6.0)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (3.1.8)
+    rack (3.1.10)
     rack-session (2.1.0)
       base64 (>= 0.1.0)
       rack (>= 3.0.0)
@@ -454,18 +466,19 @@ GEM
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
     rake (13.2.1)
-    ransack (4.2.1)
+    ransack (4.3.0)
       activerecord (>= 6.1.5)
       activesupport (>= 6.1.5)
       i18n
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rbs (2.8.4)
+    rbs (3.8.1)
+      logger
     rdoc (6.3.4.1)
     redis (5.3.0)
       redis-client (>= 0.22.0)
-    redis-client (0.23.0)
+    redis-client (0.23.2)
       connection_pool
     reek (6.1.4)
       kwalify (~> 0.7.0)
@@ -477,11 +490,11 @@ GEM
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
-    reverse_markdown (2.1.1)
+    reverse_markdown (3.0.0)
       nokogiri
     rexml (3.4.0)
     ripper-tags (1.0.2)
-    rspec-core (3.13.2)
+    rspec-core (3.13.3)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -518,13 +531,13 @@ GEM
       rubocop-ast (>= 1.30.0, < 2.0)
     rubocop-shopify (2.15.1)
       rubocop (~> 1.51)
-    ruby-openai (7.3.1)
+    ruby-openai (7.4.0)
       event_stream_parser (>= 0.3.0, < 2.0.0)
       faraday (>= 1)
       faraday-multipart (>= 1)
     ruby-progressbar (1.13.0)
     ruby-statistics (3.0.2)
-    ruby-vips (2.2.2)
+    ruby-vips (2.2.3)
       ffi (~> 1.12)
       logger
     ruby_parser (3.21.1)
@@ -555,18 +568,20 @@ GEM
     simplecov-lcov (0.8.0)
     simplecov_json_formatter (0.1.4)
     smart_properties (1.17.0)
-    solargraph (0.50.0)
+    solargraph (0.51.2)
       backport (~> 1.2)
       benchmark
       bundler (~> 2.0)
       diff-lcs (~> 1.4)
-      e2mmap
-      jaro_winkler (~> 1.5)
+      jaro_winkler (~> 1.6)
       kramdown (~> 2.3)
       kramdown-parser-gfm (~> 1.1)
+      logger (~> 1.6)
+      observer (~> 0.1)
+      ostruct (~> 0.6)
       parser (~> 3.0)
-      rbs (~> 2.0)
-      reverse_markdown (~> 2.0)
+      rbs (~> 3.0)
+      reverse_markdown (>= 2.0, < 4)
       rubocop (~> 1.38)
       thor (~> 1.0)
       tilt (~> 2.0)
@@ -598,12 +613,12 @@ GEM
       rubocop-performance (~> 1.20.2)
     syntax_tree (6.2.0)
       prettier_print (>= 1.2.0)
-    terminal-table (3.0.2)
-      unicode-display_width (>= 1.1.1, < 3)
+    terminal-table (4.0.0)
+      unicode-display_width (>= 1.1.1, < 4)
     test-prof (1.4.4)
     thor (1.3.2)
     thread_safe (0.3.6)
-    tilt (2.5.0)
+    tilt (2.6.0)
     timeout (0.4.3)
     tty-which (0.5.0)
     turbo-rails (2.0.11)
@@ -632,7 +647,7 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webmock (3.24.0)
+    webmock (3.25.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -698,6 +713,7 @@ DEPENDENCIES
   launchy
   listen (>= 3.5.1)
   mapkick-rb (~> 0.1.4)
+  mapkick-static
   meta-tags
   money-rails (~> 1.12)
   net-smtp
diff --git a/gemfiles/rails_8.0_ruby_3.3.0.gemfile b/gemfiles/rails_8.0_ruby_3.3.0.gemfile
index dd2424f93e..3741562f58 100644
--- a/gemfiles/rails_8.0_ruby_3.3.0.gemfile
+++ b/gemfiles/rails_8.0_ruby_3.3.0.gemfile
@@ -38,6 +38,7 @@ gem "sprockets-rails"
 gem "image_processing", "~> 1.12"
 gem "prefixed_ids"
 gem "mapkick-rb", "~> 0.1.4"
+gem "mapkick-static"
 gem "pluggy", path: "../pluggy"
 gem "hashid-rails", "~> 1.4", ">= 1.4.1"
 gem "money-rails", "~> 1.12"
diff --git a/gemfiles/rails_8.0_ruby_3.3.0.gemfile.lock b/gemfiles/rails_8.0_ruby_3.3.0.gemfile.lock
index b498df40e7..86d5f7e19e 100644
--- a/gemfiles/rails_8.0_ruby_3.3.0.gemfile.lock
+++ b/gemfiles/rails_8.0_ruby_3.3.0.gemfile.lock
@@ -6,7 +6,7 @@ PATH
 PATH
   remote: ..
   specs:
-    avo (3.16.1)
+    avo (3.17.6)
       actionview (>= 6.1)
       active_link_to
       activerecord (>= 6.1)
@@ -107,10 +107,12 @@ GEM
     acts_as_list (1.2.4)
       activerecord (>= 6.1)
       activesupport (>= 6.1)
-    actual_db_schema (0.8.0)
+    actual_db_schema (0.8.2)
       activerecord
       activesupport
+      ast
       csv
+      parser
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     amazing_print (1.7.2)
@@ -126,20 +128,21 @@ GEM
       money-rails (~> 1.12)
     avo-record_link_field (0.0.2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.1033.0)
-    aws-sdk-core (3.214.1)
+    aws-partitions (1.1050.0)
+    aws-sdk-core (3.218.1)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
+      base64
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.96.0)
-      aws-sdk-core (~> 3, >= 3.210.0)
+    aws-sdk-kms (1.98.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.177.0)
-      aws-sdk-core (~> 3, >= 3.210.0)
+    aws-sdk-s3 (1.180.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.10.1)
+    aws-sigv4 (1.11.0)
       aws-eventstream (~> 1, >= 1.0.2)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
@@ -173,14 +176,14 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    chartkick (5.1.2)
+    chartkick (5.1.3)
     childprocess (5.1.0)
       logger (~> 1.5)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    concurrent-ruby (1.3.4)
+    concurrent-ruby (1.3.5)
     connection_pool (2.5.0)
-    countries (7.1.0)
+    countries (7.1.1)
       unaccent (~> 0.3)
     crack (1.0.0)
       bigdecimal
@@ -221,17 +224,16 @@ GEM
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    diff-lcs (1.5.1)
+    diff-lcs (1.6.0)
     docile (1.4.1)
     dotenv (3.1.7)
     dotenv-rails (3.1.7)
       dotenv (= 3.1.7)
       railties (>= 6.1)
     drb (2.2.1)
-    e2mmap (0.1.0)
     erb-formatter (0.7.3)
       syntax_tree (~> 6.0)
-    erb_lint (0.8.0)
+    erb_lint (0.9.0)
       activesupport
       better_html (>= 2.0.1)
       parser (>= 2.7.1.4)
@@ -240,8 +242,8 @@ GEM
       smart_properties
     erubi (1.13.1)
     event_stream_parser (1.0.0)
-    factory_bot (6.5.0)
-      activesupport (>= 5.0.0)
+    factory_bot (6.5.1)
+      activesupport (>= 6.1.0)
     factory_bot_rails (6.4.4)
       factory_bot (~> 6.5)
       railties (>= 5.0.0)
@@ -299,7 +301,7 @@ GEM
       listen (>= 3.0.0)
       railties (>= 6.0.0)
     htmlbeautifier (1.4.3)
-    i18n (1.14.6)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     i18n-tasks (1.0.14)
       activesupport (>= 4.0.2)
@@ -312,14 +314,15 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       terminal-table (>= 1.5.1)
     ice_nine (0.11.2)
-    image_processing (1.13.0)
-      mini_magick (>= 4.9.5, < 5)
+    image_processing (1.14.0)
+      mini_magick (>= 4.9.5, < 6)
       ruby-vips (>= 2.0.17, < 3)
     inline_svg (1.10.0)
       activesupport (>= 3.0)
       nokogiri (>= 1.6)
     io-console (0.8.0)
-    irb (1.14.3)
+    irb (1.15.1)
+      pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     iso (0.4.0)
@@ -328,21 +331,22 @@ GEM
     jmespath (1.6.2)
     jsbundling-rails (1.3.1)
       railties (>= 6.0.0)
-    json (2.9.1)
+    json (2.10.1)
     kramdown (2.5.1)
       rexml (>= 3.3.9)
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     kwalify (0.7.2)
-    language_server-protocol (3.17.0.3)
-    launchy (3.0.1)
+    language_server-protocol (3.17.0.4)
+    launchy (3.1.0)
       addressable (~> 2.8)
       childprocess (~> 5.0)
+      logger (~> 1.6)
     lint_roller (1.1.0)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.6.4)
+    logger (1.6.5)
     loofah (2.24.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -352,6 +356,7 @@ GEM
       net-pop
       net-smtp
     mapkick-rb (0.1.5)
+    mapkick-static (0.1.1)
     marcel (1.0.4)
     matrix (0.4.2)
     memory_profiler (1.1.0)
@@ -359,7 +364,9 @@ GEM
       actionpack (>= 6.0.0, < 8.1)
     method_source (1.1.0)
     mini_histogram (0.3.1)
-    mini_magick (4.13.2)
+    mini_magick (5.1.2)
+      benchmark
+      logger
     mini_mime (1.1.5)
     minitest (5.25.4)
     monetize (1.13.0)
@@ -371,25 +378,27 @@ GEM
       monetize (~> 1.9)
       money (~> 6.13)
       railties (>= 3.0)
-    msgpack (1.7.5)
+    msgpack (1.8.0)
     multipart-post (2.4.1)
     net-http (0.6.0)
       uri
-    net-imap (0.5.5)
+    net-imap (0.5.6)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.5.0)
+    net-smtp (0.5.1)
       net-protocol
     nio4r (2.7.4)
-    nokogiri (1.18.1-arm64-darwin)
+    nokogiri (1.18.2-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.1-x86_64-linux-gnu)
+    nokogiri (1.18.2-x86_64-linux-gnu)
       racc (~> 1.4)
+    observer (0.1.2)
     orm_adapter (0.5.0)
+    ostruct (0.6.1)
     pagy (9.3.3)
     parallel (1.26.3)
     parser (3.2.2.4)
@@ -397,18 +406,21 @@ GEM
       racc
     path_expander (1.1.3)
     pg (1.5.9)
+    pp (0.6.2)
+      prettyprint
     prefixed_ids (1.8.1)
       hashids (>= 1.0.0, < 2.0.0)
       rails (>= 6.0.0)
     prettier_print (1.2.1)
+    prettyprint (0.2.0)
     prop_initializer (0.2.0)
       zeitwerk (>= 2.6.18)
     psych (3.3.4)
     public_suffix (6.0.1)
-    puma (6.5.0)
+    puma (6.6.0)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (3.1.8)
+    rack (3.1.10)
     rack-session (2.1.0)
       base64 (>= 0.1.0)
       rack (>= 3.0.0)
@@ -454,18 +466,19 @@ GEM
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
     rake (13.2.1)
-    ransack (4.2.1)
+    ransack (4.3.0)
       activerecord (>= 6.1.5)
       activesupport (>= 6.1.5)
       i18n
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rbs (2.8.4)
+    rbs (3.8.1)
+      logger
     rdoc (6.3.4.1)
     redis (5.3.0)
       redis-client (>= 0.22.0)
-    redis-client (0.23.0)
+    redis-client (0.23.2)
       connection_pool
     reek (6.1.4)
       kwalify (~> 0.7.0)
@@ -477,11 +490,11 @@ GEM
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
-    reverse_markdown (2.1.1)
+    reverse_markdown (3.0.0)
       nokogiri
     rexml (3.4.0)
     ripper-tags (1.0.2)
-    rspec-core (3.13.2)
+    rspec-core (3.13.3)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -518,13 +531,13 @@ GEM
       rubocop-ast (>= 1.30.0, < 2.0)
     rubocop-shopify (2.15.1)
       rubocop (~> 1.51)
-    ruby-openai (7.3.1)
+    ruby-openai (7.4.0)
       event_stream_parser (>= 0.3.0, < 2.0.0)
       faraday (>= 1)
       faraday-multipart (>= 1)
     ruby-progressbar (1.13.0)
     ruby-statistics (3.0.2)
-    ruby-vips (2.2.2)
+    ruby-vips (2.2.3)
       ffi (~> 1.12)
       logger
     ruby_parser (3.21.1)
@@ -555,18 +568,20 @@ GEM
     simplecov-lcov (0.8.0)
     simplecov_json_formatter (0.1.4)
     smart_properties (1.17.0)
-    solargraph (0.50.0)
+    solargraph (0.51.2)
       backport (~> 1.2)
       benchmark
       bundler (~> 2.0)
       diff-lcs (~> 1.4)
-      e2mmap
-      jaro_winkler (~> 1.5)
+      jaro_winkler (~> 1.6)
       kramdown (~> 2.3)
       kramdown-parser-gfm (~> 1.1)
+      logger (~> 1.6)
+      observer (~> 0.1)
+      ostruct (~> 0.6)
       parser (~> 3.0)
-      rbs (~> 2.0)
-      reverse_markdown (~> 2.0)
+      rbs (~> 3.0)
+      reverse_markdown (>= 2.0, < 4)
       rubocop (~> 1.38)
       thor (~> 1.0)
       tilt (~> 2.0)
@@ -598,12 +613,12 @@ GEM
       rubocop-performance (~> 1.20.2)
     syntax_tree (6.2.0)
       prettier_print (>= 1.2.0)
-    terminal-table (3.0.2)
-      unicode-display_width (>= 1.1.1, < 3)
+    terminal-table (4.0.0)
+      unicode-display_width (>= 1.1.1, < 4)
     test-prof (1.4.4)
     thor (1.3.2)
     thread_safe (0.3.6)
-    tilt (2.5.0)
+    tilt (2.6.0)
     timeout (0.4.3)
     tty-which (0.5.0)
     turbo-rails (2.0.11)
@@ -632,7 +647,7 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webmock (3.24.0)
+    webmock (3.25.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -698,6 +713,7 @@ DEPENDENCIES
   launchy
   listen (>= 3.5.1)
   mapkick-rb (~> 0.1.4)
+  mapkick-static
   meta-tags
   money-rails (~> 1.12)
   net-smtp
diff --git a/lib/avo.rb b/lib/avo.rb
index 90e03ceb9d..2518696edb 100644
--- a/lib/avo.rb
+++ b/lib/avo.rb
@@ -17,10 +17,13 @@ module Avo
   IN_DEVELOPMENT = ENV["AVO_IN_DEVELOPMENT"] == "1"
   PACKED = !IN_DEVELOPMENT
   COOKIES_KEY = "avo"
-  MODAL_FRAME_ID = :modal_frame
-  ACTIONS_BACKGROUND_FRAME = :actions_background
   CACHED_SVGS = {}
 
+  # Frame IDs
+  MODAL_FRAME_ID = :modal_frame
+  MEDIA_LIBRARY_ITEM_DETAILS_FRAME_ID = :media_library_item_details
+  ACTIONS_BACKGROUND_FRAME_ID = :actions_background
+
   class LicenseVerificationTemperedError < StandardError; end
 
   class LicenseInvalidError < StandardError; end
diff --git a/lib/avo/asset_manager.rb b/lib/avo/asset_manager.rb
index c29334ce5a..57a5dacb29 100644
--- a/lib/avo/asset_manager.rb
+++ b/lib/avo/asset_manager.rb
@@ -2,14 +2,18 @@ module Avo
   class AssetManager
     include ActionView::Helpers::AssetTagHelper
 
+    attr_reader :stimulus_controllers
+
     def initialize
       @stylesheets = []
       @javascripts = []
+      @stimulus_controllers = {}
     end
 
     def reset
       @stylesheets = []
       @javascripts = []
+      @stimulus_controllers = {}
     end
 
     def add_stylesheet(path)
@@ -20,6 +24,10 @@ def add_javascript(path)
       @javascripts.push path
     end
 
+    def register_stimulus_controller(name, controller)
+      @stimulus_controllers[name] = controller
+    end
+
     def stylesheets
       @stylesheets.uniq
     end
diff --git a/lib/avo/base_action.rb b/lib/avo/base_action.rb
index 3b31de11bd..c55dd0515c 100644
--- a/lib/avo/base_action.rb
+++ b/lib/avo/base_action.rb
@@ -12,7 +12,13 @@ class BaseAction
     class_attribute :cancel_button_label
     class_attribute :no_confirmation, default: false
     class_attribute :standalone, default: false
-    class_attribute :visible
+    class_attribute :visible, default: -> {
+      # Hide on the :new view by default
+      return false if view.new?
+
+      # Show on all other views
+      true
+    }
     class_attribute :may_download_file
     class_attribute :turbo
     class_attribute :authorize, default: true
@@ -27,6 +33,7 @@ class BaseAction
     attr_reader :icon
     attr_reader :appended_turbo_streams
     attr_reader :records_to_reload
+    attr_reader :query
 
     # TODO: find a differnet way to delegate this to the uninitialized Current variable
     delegate :context, to: Avo::Current
@@ -100,14 +107,15 @@ def action_name
           resource: @resource,
           record: @record,
           view: @view,
-          arguments: @arguments
+          arguments: @arguments,
+          query: @query
         ).handle
       end
 
       self.class.to_s.demodulize.underscore.humanize(keep_id_suffix: true)
     end
 
-    def initialize(record: nil, resource: nil, user: nil, view: nil, arguments: {}, icon: :play)
+    def initialize(record: nil, resource: nil, user: nil, view: nil, arguments: {}, icon: :play, query: nil)
       @record = record
       @resource = resource
       @user = user
@@ -118,6 +126,7 @@ def initialize(record: nil, resource: nil, user: nil, view: nil, arguments: {},
         resource: resource,
         record: record
       ).handle.with_indifferent_access
+      @query = query
 
       self.class.message ||= I18n.t("avo.are_you_sure_you_want_to_run_this_option")
       self.class.confirm_button_label ||= I18n.t("avo.run")
@@ -143,7 +152,8 @@ def get_message
         resource: @resource,
         record: @record,
         view: @view,
-        arguments: @arguments
+        arguments: @arguments,
+        query: @query
       ).handle
     end
 
@@ -153,7 +163,8 @@ def cancel_button_label
         resource: @resource,
         record: @record,
         view: @view,
-        arguments: @arguments
+        arguments: @arguments,
+        query: @query
       ).handle
     end
 
@@ -163,7 +174,8 @@ def confirm_button_label
         resource: @resource,
         record: @record,
         view: @view,
-        arguments: @arguments
+        arguments: @arguments,
+        query: @query
       ).handle
     end
 
@@ -205,17 +217,6 @@ def handle_action(**args)
     end
 
     def visible_in_view(parent_resource: nil)
-      return false unless authorized?
-
-      if visible.blank?
-        # Hide on the :new view by default
-        return false if view.new?
-
-        # Show on all other views
-        return true
-      end
-
-      # Run the visible block if available
       Avo::ExecutionContext.new(
         target: visible,
         params: params,
@@ -223,7 +224,7 @@ def visible_in_view(parent_resource: nil)
         resource: @resource,
         view: @view,
         arguments: arguments
-      ).handle
+      ).handle && authorized?
     end
 
     def succeed(text)
diff --git a/lib/avo/concerns/controls_placement.rb b/lib/avo/concerns/controls_placement.rb
deleted file mode 100644
index 5ad97b25dd..0000000000
--- a/lib/avo/concerns/controls_placement.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-module Avo
-  module Concerns
-    module ControlsPlacement
-      extend ActiveSupport::Concern
-
-      def controls_placement_calculated
-        @controls_placement_calculated ||= controls_placement || Avo.configuration.resource_controls_placement
-      end
-
-      def resource_controls_render_on_the_right?
-        controls_placement_calculated == :right || resource_controls_render_on_both_sides?
-      end
-
-      def resource_controls_render_on_the_left?
-        controls_placement_calculated == :left || resource_controls_render_on_both_sides?
-      end
-
-      private
-
-      def resource_controls_render_on_both_sides?
-        controls_placement_calculated == :both
-      end
-    end
-  end
-end
diff --git a/lib/avo/concerns/find_association_field.rb b/lib/avo/concerns/find_association_field.rb
index bf76279556..c66286a271 100644
--- a/lib/avo/concerns/find_association_field.rb
+++ b/lib/avo/concerns/find_association_field.rb
@@ -3,7 +3,7 @@ module Concerns
     module FindAssociationField
       # The supported association types are defined in the ASSOCIATIONS constant.
       unless defined?(ASSOCIATIONS)
-        ASSOCIATIONS = ["belongs_to", "has_one", "has_many", "has_and_belongs_to_many"]
+        ASSOCIATIONS = ["belongs_to", "has_one", "has_many", "has_and_belongs_to_many", "array"]
       end
 
       # This method is used to find an association field for a given resource.
diff --git a/lib/avo/concerns/has_field_discovery.rb b/lib/avo/concerns/has_field_discovery.rb
new file mode 100644
index 0000000000..46ffc863b4
--- /dev/null
+++ b/lib/avo/concerns/has_field_discovery.rb
@@ -0,0 +1,243 @@
+# frozen_string_literal: true
+
+# TODO: Refactor this concern to be more readable and maintainable
+# rubocop:disable Metrics/ModuleLength
+module Avo
+  module Concerns
+    # This concern facilitates field discovery for models in Avo,
+    # mapping database columns and associations to Avo fields.
+    # It supports:
+    #  - Automatic detection of fields based on column names, types, and associations.
+    #  - Customization via `only`, `except`, and global configuration overrides.
+    #  - Handling of special associations like rich text, attachments, and tags.
+    module HasFieldDiscovery
+      extend ActiveSupport::Concern
+
+      COLUMN_NAMES_TO_IGNORE = %i[
+        encrypted_password reset_password_token reset_password_sent_at remember_created_at password_digest
+      ].freeze
+
+      class_methods do
+        def column_names_mapping
+          @column_names_mapping ||= Avo::Mappings::NAMES_MAPPING.dup
+            .merge(Avo.configuration.column_names_mapping || {})
+        end
+
+        def column_types_mapping
+          @column_types_mapping ||= Avo::Mappings::FIELDS_MAPPING.dup
+            .merge(Avo.configuration.column_types_mapping || {})
+        end
+      end
+
+      # Returns database columns for the model, excluding ignored columns
+      def model_db_columns
+        @model_db_columns ||= safe_model_class.columns_hash.symbolize_keys.except(*COLUMN_NAMES_TO_IGNORE)
+      end
+
+      # Discovers and configures database columns as fields
+      def discover_columns(only: nil, except: nil, **field_options)
+        setup_discovery_options(only, except, field_options)
+        return unless safe_model_class.respond_to?(:columns_hash)
+
+        discoverable_columns.each do |column_name, column|
+          process_column(column_name, column)
+        end
+
+        discover_tags
+        discover_rich_texts
+      end
+
+      # Discovers and configures associations as fields
+      def discover_associations(only: nil, except: nil, **field_options)
+        setup_discovery_options(only, except, field_options)
+        return unless safe_model_class.respond_to?(:reflections)
+
+        discover_attachments
+        discover_basic_associations
+      end
+
+      private
+
+      def setup_discovery_options(only, except, field_options)
+        @only = only
+        @except = except
+        @field_options = field_options
+      end
+
+      def discoverable_columns
+        model_db_columns.reject do |column_name, _|
+          skip_column?(column_name)
+        end
+      end
+
+      def skip_column?(column_name)
+        !column_in_scope?(column_name) ||
+          reflections.key?(column_name) ||
+          rich_text_column?(column_name)
+      end
+
+      def rich_text_column?(column_name)
+        rich_texts.key?(:"rich_text_#{column_name}")
+      end
+
+      def process_column(column_name, column)
+        field_config = determine_field_config(column_name, column)
+        return unless field_config
+
+        create_field(column_name, field_config)
+      end
+
+      def create_field(column_name, field_config)
+        field_options = {as: field_config.dup.delete(:field).to_sym}.merge(field_config)
+        field(column_name, **field_options.symbolize_keys, **@field_options.symbolize_keys)
+      end
+
+      def create_attachment_field(association_name, reflection)
+        field_name = association_name&.to_s&.delete_suffix("_attachment")&.to_sym || association_name
+        field_type = determine_attachment_field_type(reflection)
+        field(field_name, as: field_type, **@field_options)
+      end
+
+      def determine_attachment_field_type(reflection)
+        (
+          reflection.is_a?(ActiveRecord::Reflection::HasOneReflection) ||
+          reflection.is_a?(ActiveStorage::Reflection::HasOneAttachedReflection)
+        ) ? :file : :files
+      end
+
+      def create_association_field(association_name, reflection)
+        options = base_association_options(reflection)
+        options.merge!(polymorphic_options(reflection)) if reflection.options[:polymorphic]
+
+        field(association_name, **options, **@field_options)
+      end
+
+      def base_association_options(reflection)
+        {
+          as: reflection.macro,
+          searchable: true,
+          sortable: true
+        }
+      end
+
+      # Fetches the model class, falling back to the items_holder parent record in certain instances
+      # (e.g. in the context of the sidebar)
+      def safe_model_class
+        respond_to?(:model_class) ? model_class : @items_holder.parent.model_class
+      rescue ActiveRecord::NoDatabaseError, ActiveRecord::ConnectionNotEstablished
+        nil
+      end
+
+      def model_enums
+        @model_enums ||= if safe_model_class.respond_to?(:defined_enums)
+          safe_model_class.defined_enums.transform_values do |enum|
+            {
+              field: :select,
+              enum:
+            }
+          end
+        else
+          {}
+        end.with_indifferent_access
+      end
+
+      # Determines if a column is included in the discovery scope.
+      # A column is in scope if it's included in `only` and not in `except`.
+      def column_in_scope?(column_name)
+        (!@only || @only.include?(column_name)) && (!@except || !@except.include?(column_name))
+      end
+
+      def determine_field_config(attribute, column)
+        model_enums[attribute.to_s] ||
+          self.class.column_names_mapping[attribute] ||
+          self.class.column_types_mapping[column.type]
+      end
+
+      def discover_by_type(associations, as_type)
+        associations.each_key do |association_name|
+          next unless column_in_scope?(association_name)
+
+          field association_name, as: as_type, **@field_options.merge(name: yield(association_name))
+        end
+      end
+
+      def discover_rich_texts
+        rich_texts.each_key do |association_name|
+          next unless column_in_scope?(association_name)
+
+          field_name = association_name&.to_s&.delete_prefix("rich_text_")&.to_sym || association_name
+          field field_name, as: :trix, **@field_options
+        end
+      end
+
+      def discover_tags
+        tags.each_key do |association_name|
+          next unless column_in_scope?(association_name)
+
+          field(
+            tag_field_name(association_name), as: :tags,
+            acts_as_taggable_on: tag_field_name(association_name),
+            **@field_options
+          )
+        end
+      end
+
+      def tag_field_name(association_name)
+        association_name&.to_s&.delete_suffix("_taggings")&.pluralize&.to_sym || association_name
+      end
+
+      def discover_attachments
+        attachment_associations.each do |association_name, reflection|
+          next unless column_in_scope?(association_name)
+
+          create_attachment_field(association_name, reflection)
+        end
+      end
+
+      def discover_basic_associations
+        associations.each do |association_name, reflection|
+          next unless column_in_scope?(association_name)
+
+          create_association_field(association_name, reflection)
+        end
+      end
+
+      def polymorphic_options(reflection)
+        {polymorphic_as: reflection.name, types: detect_polymorphic_types(reflection)}
+      end
+
+      def detect_polymorphic_types(reflection)
+        ApplicationRecord.descendants.select { |klass| klass.reflections[reflection.plural_name] }
+      end
+
+      def reflections
+        @reflections ||= safe_model_class.reflections.symbolize_keys.reject do |name, _|
+          ignore_reflection?(name.to_s)
+        end
+      end
+
+      def attachment_associations
+        @attachment_associations ||= reflections.select { |_, r| r.options[:class_name] == "ActiveStorage::Attachment" }
+      end
+
+      def rich_texts
+        @rich_texts ||= reflections.select { |_, r| r.options[:class_name] == "ActionText::RichText" }
+      end
+
+      def tags
+        @tags ||= reflections.select { |_, r| r.options[:as] == :taggable }
+      end
+
+      def associations
+        @associations ||= reflections.reject do |key|
+          attachment_associations.key?(key) || tags.key?(key) || rich_texts.key?(key)
+        end
+      end
+
+      def ignore_reflection?(name)
+        %w[blob blobs tags].include?(name.split("_").pop) || name.to_sym == :taggings
+      end
+    end
+  end
+end
+# rubocop:enable Metrics/ModuleLength
diff --git a/lib/avo/concerns/has_items.rb b/lib/avo/concerns/has_items.rb
index 9381b73cd6..08da78d258 100644
--- a/lib/avo/concerns/has_items.rb
+++ b/lib/avo/concerns/has_items.rb
@@ -326,8 +326,11 @@ def is_standalone?(item)
       def hydrate_item(item)
         return unless item.respond_to? :hydrate
 
-        res = self.class.ancestors.include?(Avo::BaseResource) ? self : resource
-        item.hydrate(view: view, resource: res)
+        item.hydrate(
+          view: view,
+          # Use self when this is executed from a resource context, call resource otherwise.
+          resource: self.class.ancestors.include?(Avo::Resources::Base) ? self : resource
+        )
       end
     end
   end
diff --git a/lib/avo/concerns/has_resource_stimulus_controllers.rb b/lib/avo/concerns/has_resource_stimulus_controllers.rb
index c8b8bf0f30..039246bfb9 100644
--- a/lib/avo/concerns/has_resource_stimulus_controllers.rb
+++ b/lib/avo/concerns/has_resource_stimulus_controllers.rb
@@ -23,7 +23,7 @@ def get_stimulus_controllers
 
         controllers << self.class.stimulus_controllers
 
-        controllers.join " "
+        controllers.reject(&:blank?).join " "
       end
 
       def stimulus_data_attributes
@@ -38,9 +38,9 @@ def stimulus_data_attributes
         attributes
       end
 
-      def add_stimulus_attributes_for(entity, attributes)
+      def add_stimulus_attributes_for(entity, attributes, target_name = nil)
         entity.get_stimulus_controllers.split(" ").each do |controller|
-          attributes["#{controller}-target"] = "#{@field.id.to_s.underscore}_#{@field.type.to_s.underscore}_wrapper".camelize(:lower)
+          attributes["#{controller}-target"] = target_name || "#{@field.id.to_s.underscore}_#{@field.type.to_s.underscore}_wrapper".camelize(:lower)
         end
       end
     end
diff --git a/lib/avo/concerns/pagination.rb b/lib/avo/concerns/pagination.rb
index 784ac8a1f3..619ae39d1f 100644
--- a/lib/avo/concerns/pagination.rb
+++ b/lib/avo/concerns/pagination.rb
@@ -12,6 +12,7 @@ module Pagination
           PAGINATION_METHOD = {
             default: :pagy,
             countless: :pagy_countless,
+            array: :pagy_array,
           }
         end
 
diff --git a/lib/avo/concerns/row_controls_configuration.rb b/lib/avo/concerns/row_controls_configuration.rb
new file mode 100644
index 0000000000..6ab23fb2dc
--- /dev/null
+++ b/lib/avo/concerns/row_controls_configuration.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Avo
+  module Concerns
+    module RowControlsConfiguration
+      extend ActiveSupport::Concern
+
+      included do
+        class_attribute :row_controls_config, default: {}
+      end
+
+      def controls_placement
+        @controls_placement ||= row_controls_configurations[:placement]
+      end
+
+      def render_row_controls_on_the_right?
+        controls_placement.in? [:right, :both]
+      end
+
+      def render_row_controls_on_the_left?
+        controls_placement.in? [:left, :both]
+      end
+
+      def row_controls_configurations
+        @row_controls_configurations ||= Avo.configuration.resource_row_controls_config.merge(row_controls_config)
+      end
+
+      def row_controls_classes
+        classes = "text-right whitespace-nowrap px-3"
+
+        if render_row_controls_on_the_left?
+          classes += " w-px"
+        end
+
+        if row_controls_configurations[:show_on_hover]
+          classes += " opacity-0 group-hover:opacity-100"
+        end
+
+        if row_controls_configurations[:float]
+          classes += " floating-row-controls sticky group-hover:bg-gray-50 bg-white inset-auto right-0"
+        end
+
+        classes
+      end
+    end
+  end
+end
diff --git a/lib/avo/configuration.rb b/lib/avo/configuration.rb
index 6176103d8f..42a3ba6f0a 100644
--- a/lib/avo/configuration.rb
+++ b/lib/avo/configuration.rb
@@ -1,7 +1,5 @@
 module Avo
   class Configuration
-    include ResourceConfiguration
-
     attr_writer :app_name
     attr_writer :branding
     attr_writer :root_path
@@ -12,6 +10,7 @@ class Configuration
     attr_writer :explicit_authorization
     attr_writer :exclude_from_status
     attr_writer :persistence
+    attr_writer :resource_row_controls_config
     attr_accessor :timezone
     attr_accessor :per_page
     attr_accessor :per_page_steps
@@ -58,6 +57,8 @@ class Configuration
     attr_accessor :search_results_count
     attr_accessor :first_sorting_option
     attr_accessor :associations_lookup_list_limit
+    attr_accessor :column_names_mapping
+    attr_accessor :column_types_mapping
 
     def initialize
       @root_path = "/avo"
@@ -125,6 +126,21 @@ def initialize
       @first_sorting_option = :desc # :desc or :asc
       @associations_lookup_list_limit = 1000
       @exclude_from_status = []
+      @column_names_mapping = {}
+      @column_types_mapping = {}
+      @resource_row_controls_config = {}
+    end
+
+    unless defined?(RESOURCE_ROW_CONTROLS_CONFIG_DEFAULTS)
+      RESOURCE_ROW_CONTROLS_CONFIG_DEFAULTS = {
+        placement: :right,
+        float: false,
+        show_on_hover: false
+      }.freeze
+    end
+
+    def resource_row_controls_config
+      RESOURCE_ROW_CONTROLS_CONFIG_DEFAULTS.merge @resource_row_controls_config
     end
 
     # Authorization is enabled when:
diff --git a/lib/avo/configuration/resource_configuration.rb b/lib/avo/configuration/resource_configuration.rb
deleted file mode 100644
index 1ab6944653..0000000000
--- a/lib/avo/configuration/resource_configuration.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Avo
-  class Configuration
-    module ResourceConfiguration
-      def resource_controls_placement=(val)
-        @resource_controls_placement_instance = val
-      end
-
-      def resource_controls_placement
-        @resource_controls_placement_instance || :right
-      end
-    end
-  end
-end
diff --git a/lib/avo/fields/array_field.rb b/lib/avo/fields/array_field.rb
new file mode 100644
index 0000000000..51c0cf2965
--- /dev/null
+++ b/lib/avo/fields/array_field.rb
@@ -0,0 +1,17 @@
+module Avo
+  module Fields
+    class ArrayField < ManyFrameBaseField
+      def translated_name(default:)
+        t(translation_key, count: 2, default: default_name).capitalize
+      end
+
+      def view_component_name
+        "HasManyField"
+      end
+
+      def resource_class(params)
+        use_resource || Avo.resource_manager.get_resource_by_name(@id.to_s)
+      end
+    end
+  end
+end
diff --git a/lib/avo/fields/belongs_to_field.rb b/lib/avo/fields/belongs_to_field.rb
index b8910292a0..95e0b96897 100644
--- a/lib/avo/fields/belongs_to_field.rb
+++ b/lib/avo/fields/belongs_to_field.rb
@@ -63,7 +63,6 @@ class BelongsToField < BaseField
       attr_accessor :target
 
       attr_reader :polymorphic_as
-      attr_reader :relation_method
       attr_reader :types # for Polymorphic associations
       attr_reader :allow_via_detaching
       attr_reader :attach_scope
@@ -96,7 +95,7 @@ def value
           super(polymorphic_as)
         else
           # Get the value from the pre-filled association record
-          super(relation_method)
+          super(@relation_method)
         end
       end
 
diff --git a/lib/avo/fields/markdown_field.rb b/lib/avo/fields/easy_mde_field.rb
similarity index 93%
rename from lib/avo/fields/markdown_field.rb
rename to lib/avo/fields/easy_mde_field.rb
index 4ca474201e..2dc572fa79 100644
--- a/lib/avo/fields/markdown_field.rb
+++ b/lib/avo/fields/easy_mde_field.rb
@@ -1,6 +1,6 @@
 module Avo
   module Fields
-    class MarkdownField < BaseField
+    class EasyMdeField < BaseField
       attr_reader :options
 
       def initialize(id, **args, &block)
diff --git a/lib/avo/fields/has_base_field.rb b/lib/avo/fields/frame_base_field.rb
similarity index 69%
rename from lib/avo/fields/has_base_field.rb
rename to lib/avo/fields/frame_base_field.rb
index 2e32c0ba10..aca2977aaa 100644
--- a/lib/avo/fields/has_base_field.rb
+++ b/lib/avo/fields/frame_base_field.rb
@@ -1,35 +1,18 @@
 module Avo
   module Fields
-    class HasBaseField < BaseField
-      include Avo::Fields::Concerns::IsSearchable
+    class FrameBaseField < BaseField
       include Avo::Fields::Concerns::UseResource
       include Avo::Fields::Concerns::ReloadIcon
       include Avo::Fields::Concerns::LinkableTitle
-
-      attr_accessor :display
-      attr_accessor :scope
-      attr_accessor :attach_scope
-      attr_accessor :description
-      attr_accessor :discreet_pagination
-      attr_accessor :hide_search_input
-      attr_reader :link_to_child_resource
-      attr_reader :attach_fields
+      include Avo::Concerns::HasDescription
 
       def initialize(id, **args, &block)
         super(id, **args, &block)
-        @scope = args[:scope].present? ? args[:scope] : nil
-        @attach_scope = args[:attach_scope].present? ? args[:attach_scope] : nil
-        @display = args[:display].present? ? args[:display] : :show
-        @searchable = args[:searchable] == true
-        @hide_search_input = args[:hide_search_input] || false
+
+        @use_resource = args[:use_resource]
+        @reloadable = args[:reloadable]
+        @linkable = args[:linkable]
         @description = args[:description]
-        @use_resource = args[:use_resource] || nil
-        @discreet_pagination = args[:discreet_pagination] || false
-        # Defaults to nil so that if not set falls back to `link_to_child_resource` defined in the resource
-        @link_to_child_resource = args[:link_to_child_resource]
-        @reloadable = args[:reloadable].present? ? args[:reloadable] : false
-        @linkable = args[:linkable].present? ? args[:linkable] : false
-        @attach_fields = args[:attach_fields]
       end
 
       def field_resource
@@ -37,7 +20,7 @@ def field_resource
       end
 
       def turbo_frame
-        "#{self.class.name.demodulize.to_s.underscore}_#{display}_#{frame_id}"
+        "#{self.class.name.demodulize.to_s.underscore}_show_#{frame_id}"
       end
 
       def frame_url(add_turbo_frame: true)
@@ -122,6 +105,18 @@ def query_params(add_turbo_frame: true)
         }.compact
       end
 
+      def resource_class(params)
+        return use_resource if use_resource.present?
+
+        return Avo.resource_manager.get_resource_by_name @id.to_s if @array
+
+        reflection = @record.class.reflect_on_association(@for_attribute || params[:related_name])
+
+        reflected_model = reflection.klass
+
+        Avo.resource_manager.get_resource_by_model_class reflected_model
+      end
+
       private
 
       def frame_id
diff --git a/lib/avo/fields/has_and_belongs_to_many_field.rb b/lib/avo/fields/has_and_belongs_to_many_field.rb
index 9ec327992c..d616cc2ffe 100644
--- a/lib/avo/fields/has_and_belongs_to_many_field.rb
+++ b/lib/avo/fields/has_and_belongs_to_many_field.rb
@@ -1,14 +1,6 @@
 module Avo
   module Fields
-    class HasAndBelongsToManyField < HasBaseField
-      def initialize(id, **args, &block)
-        args[:updatable] = false
-
-        only_on Avo.configuration.resource_default_view
-
-        super(id, **args, &block)
-      end
-
+    class HasAndBelongsToManyField < HasManyBaseField
       def view_component_name
         "HasManyField"
       end
diff --git a/lib/avo/fields/has_many_base_field.rb b/lib/avo/fields/has_many_base_field.rb
new file mode 100644
index 0000000000..439a849bcf
--- /dev/null
+++ b/lib/avo/fields/has_many_base_field.rb
@@ -0,0 +1,18 @@
+module Avo
+  module Fields
+    class HasManyBaseField < ManyFrameBaseField
+      attr_reader :attach_scope,
+        :link_to_child_resource,
+        :attach_fields
+
+      def initialize(id, **args, &block)
+        super(id, **args, &block)
+
+        @attach_scope = args[:attach_scope]
+        # Defaults to nil so that if not set falls back to `link_to_child_resource` defined in the resource
+        @link_to_child_resource = args[:link_to_child_resource]
+        @attach_fields = args[:attach_fields]
+      end
+    end
+  end
+end
diff --git a/lib/avo/fields/has_many_field.rb b/lib/avo/fields/has_many_field.rb
index 6c7932f164..d68f579f5b 100644
--- a/lib/avo/fields/has_many_field.rb
+++ b/lib/avo/fields/has_many_field.rb
@@ -1,14 +1,6 @@
 module Avo
   module Fields
-    class HasManyField < HasBaseField
-      def initialize(id, **args, &block)
-        args[:updatable] = false
-
-        only_on Avo.configuration.resource_default_view
-
-        super(id, **args, &block)
-      end
-
+    class HasManyField < HasManyBaseField
       def translated_name(default:)
         t(translation_key, count: 2, default: default_name).capitalize
       end
diff --git a/lib/avo/fields/has_one_field.rb b/lib/avo/fields/has_one_field.rb
index 5b80072b1a..cbec708ad5 100644
--- a/lib/avo/fields/has_one_field.rb
+++ b/lib/avo/fields/has_one_field.rb
@@ -1,7 +1,8 @@
 module Avo
   module Fields
-    class HasOneField < HasBaseField
-      attr_accessor :relation_method
+    class HasOneField < FrameBaseField
+      attr_reader :attach_fields,
+        :attach_scope
 
       def initialize(id, **args, &block)
         hide_on :forms
@@ -9,8 +10,8 @@ def initialize(id, **args, &block)
         super(id, **args, &block)
 
         @placeholder ||= I18n.t "avo.choose_an_option"
-
-        @relation_method = name.to_s.parameterize.underscore
+        @attach_fields = args[:attach_fields]
+        @attach_scope = args[:attach_scope]
       end
 
       def label
@@ -37,6 +38,8 @@ def fill_field(record, key, value, params)
 
         record
       end
+
+      def is_searchable? = false
     end
   end
 end
diff --git a/lib/avo/fields/location_field.rb b/lib/avo/fields/location_field.rb
index e92954c1c0..b0f935ebeb 100644
--- a/lib/avo/fields/location_field.rb
+++ b/lib/avo/fields/location_field.rb
@@ -3,47 +3,72 @@
 module Avo
   module Fields
     class LocationField < BaseField
-      attr_reader :stored_as, :zoom
-
       def initialize(id, **args, &block)
         hide_on :index
         super(id, **args, &block)
 
-        @stored_as = args[:stored_as].present? ? args[:stored_as] : nil # You can pass it an array of db columns [:latitude, :longitude]
-        @zoom = args[:zoom].present? ? args[:zoom].to_i : 15
+        # You can pass it an array of db columns [:latitude, :longitude]
+        @stored_as = args[:stored_as]
+      end
+
+      def render_map(params)
+        return "—" if !value_present?
+
+        render_static_map = params[:action] == "preview" || @args[:static]
+
+        Avo::Current.view_context.send render_static_map ? :static_map : :js_map,
+          [{latitude: value[0], longitude: value[1]}],
+           **default_mapkick_options(render_static_map)
+      end
+
+      def default_mapkick_options(render_static_map)
+        default_options = if render_static_map
+          {
+            width: 300,
+            height: 300
+          }
+        else
+          {
+            id: "location-map",
+            zoom: @args[:zoom]&.to_i || 15,
+            controls: true
+          }
+        end
+
+        default_options.merge(@args[:mapkick_options] || {})
       end
 
       def value_as_array?
-        stored_as.is_a?(Array) && stored_as.count == 2
+        @stored_as.is_a?(Array) && @stored_as.count == 2
       end
 
       def as_lat_long_field_id(get)
         if get == :lat
-          stored_as.first
+          @stored_as.first
         elsif get == :long
-          stored_as.last
+          @stored_as.last
         end
       end
 
       def as_lat_long_placeholder(get)
         if get == :lat
-          "Enter #{stored_as.first}"
+          "Enter #{@stored_as.first}"
         elsif get == :long
-          "Enter #{stored_as.last}"
+          "Enter #{@stored_as.last}"
         end
       end
 
       def as_lat_long_value(get)
         if get == :lat
-          record.send(stored_as.first)
+          record.send(@stored_as.first)
         elsif get == :long
-          record.send(stored_as.last)
+          record.send(@stored_as.last)
         end
       end
 
       def fill_field(record, key, value, params)
         if value_as_array?
-          latitude_field, longitude_field = stored_as
+          latitude_field, longitude_field = @stored_as
           record.send(:"#{latitude_field}=", value[latitude_field])
           record.send(:"#{longitude_field}=", value[longitude_field])
           record
@@ -62,7 +87,7 @@ def to_permitted_param
 
       def value
         if value_as_array?
-          [@record.send(stored_as.first), @record.send(stored_as.last)]
+          [@record.send(@stored_as.first), @record.send(@stored_as.last)]
         else
           super
         end
@@ -75,9 +100,9 @@ def value_present?
       end
 
       def assign_value(record:, value:)
-        return super if stored_as.blank?
+        return super if @stored_as.blank?
 
-        stored_as.each_with_index do |database_id, index|
+        @stored_as.each_with_index do |database_id, index|
           record.send(:"#{database_id}=", value[index])
         end
       end
diff --git a/lib/avo/fields/many_frame_base_field.rb b/lib/avo/fields/many_frame_base_field.rb
new file mode 100644
index 0000000000..7746637f5c
--- /dev/null
+++ b/lib/avo/fields/many_frame_base_field.rb
@@ -0,0 +1,24 @@
+module Avo
+  module Fields
+    class ManyFrameBaseField < FrameBaseField
+      include Avo::Fields::Concerns::IsSearchable
+
+      attr_reader :scope,
+        :hide_search_input,
+        :discreet_pagination
+
+      def initialize(id, **args, &block)
+        args[:updatable] = false
+
+        only_on Avo.configuration.resource_default_view
+
+        super(id, **args, &block)
+
+        @searchable = args[:searchable]
+        @scope = args[:scope]
+        @hide_search_input = args[:hide_search_input]
+        @discreet_pagination = args[:discreet_pagination]
+      end
+    end
+  end
+end
diff --git a/lib/avo/fields/select_field.rb b/lib/avo/fields/select_field.rb
index d28f7dba20..9cf21251cc 100644
--- a/lib/avo/fields/select_field.rb
+++ b/lib/avo/fields/select_field.rb
@@ -3,7 +3,7 @@ module Fields
     class SelectField < BaseField
       include Avo::Fields::FieldExtensions::HasIncludeBlank
 
-      attr_reader :display_value
+      attr_reader :display_value, :multiple
 
       def initialize(id, **args, &block)
         args[:placeholder] ||= I18n.t("avo.choose_an_option")
@@ -19,6 +19,7 @@ def initialize(id, **args, &block)
         end
 
         @enum = args[:enum]
+        @multiple = args[:multiple]
         @display_value = args[:display_value] || false
       end
 
@@ -40,8 +41,12 @@ def options_for_select
       end
 
       def label
+        return "—" if value.nil? || (@multiple && value.empty?)
+
         # If options are array don't need any pre-process
-        return value if options.is_a?(Array)
+        if options.is_a?(Array)
+          return @multiple ? value.join(", ") : value
+        end
 
         # If options are enum and display_value is true we return the Value of that key-value pair, else return key of that key-value pair
         # WARNING: value here is the DB stored value and not the value of a key-value pair.
@@ -52,7 +57,25 @@ def label
 
         # When code arrive here it means options are Hash
         # If display_value is true we only need to return the value stored in DB
-        display_value ? value : options.invert[value]
+        if display_value
+          value
+        elsif @multiple
+          options.select { |_, v| value.include?(v.to_s) }.keys.join(", ")
+        else
+          options.invert[value]
+        end
+      end
+
+      def to_permitted_param
+        @multiple ? {"#{id}": []} : id
+      end
+
+      def fill_field(record, key, value, params)
+        if @multiple
+          value = value.reject(&:blank?)
+        end
+
+        super
       end
 
       private
diff --git a/lib/avo/fields/tags_field.rb b/lib/avo/fields/tags_field.rb
index 550acd3e0d..da598949fb 100644
--- a/lib/avo/fields/tags_field.rb
+++ b/lib/avo/fields/tags_field.rb
@@ -39,7 +39,7 @@ def field_value
           acts_as_taggable_on_values.map { |value| {value:} }.as_json
         else
           # Wrap the value on Array to ensure select mode compatibility
-          Array(value) || []
+          Array.wrap(value) || []
         end
       end
 
@@ -78,7 +78,7 @@ def fill_acts_as_taggable(record, key, value, params)
       def whitelist_items
         return suggestions.to_json if enforce_suggestions
 
-        (suggestions + field_value).to_json
+        (suggestions + field_value).uniq.to_json
       end
 
       def suggestions
diff --git a/lib/avo/mappings.rb b/lib/avo/mappings.rb
new file mode 100644
index 0000000000..8723320b67
--- /dev/null
+++ b/lib/avo/mappings.rb
@@ -0,0 +1,113 @@
+module Avo
+  module Mappings
+    unless defined?(ASSOCIATIONS_MAPPING)
+      ASSOCIATIONS_MAPPING = {
+        ActiveRecord::Reflection::BelongsToReflection => {
+          field: "belongs_to"
+        },
+        ActiveRecord::Reflection::HasOneReflection => {
+          field: "has_one"
+        },
+        ActiveRecord::Reflection::HasManyReflection => {
+          field: "has_many"
+        },
+        ActiveRecord::Reflection::HasAndBelongsToManyReflection => {
+          field: "has_and_belongs_to_many"
+        }
+      }.freeze
+    end
+
+    unless defined?(ATTACHMENTS_MAPPING)
+      ATTACHMENTS_MAPPING = {
+        ActiveRecord::Reflection::HasOneReflection => {
+          field: "file"
+        },
+        ActiveRecord::Reflection::HasManyReflection => {
+          field: "files"
+        }
+      }.freeze
+    end
+
+    unless defined?(FIELDS_MAPPING)
+      FIELDS_MAPPING = {
+        primary_key: {
+          field: "id"
+        },
+        string: {
+          field: "text"
+        },
+        text: {
+          field: "textarea"
+        },
+        integer: {
+          field: "number"
+        },
+        float: {
+          field: "number"
+        },
+        decimal: {
+          field: "number"
+        },
+        datetime: {
+          field: "date_time"
+        },
+        timestamp: {
+          field: "date_time"
+        },
+        time: {
+          field: "date_time"
+        },
+        date: {
+          field: "date"
+        },
+        binary: {
+          field: "number"
+        },
+        boolean: {
+          field: "boolean"
+        },
+        references: {
+          field: "belongs_to"
+        },
+        json: {
+          field: "code"
+        }
+      }.freeze
+    end
+
+    unless defined?(NAMES_MAPPING)
+      NAMES_MAPPING = {
+        id: {
+          field: "id"
+        },
+        description: {
+          field: "textarea"
+        },
+        gravatar: {
+          field: "gravatar"
+        },
+        email: {
+          field: "text"
+        },
+        password: {
+          field: "password"
+        },
+        password_confirmation: {
+          field: "password"
+        },
+        stage: {
+          field: "select"
+        },
+        budget: {
+          field: "currency"
+        },
+        money: {
+          field: "currency"
+        },
+        country: {
+          field: "country"
+        }
+      }.freeze
+    end
+  end
+end
diff --git a/lib/avo/media_library/configuration.rb b/lib/avo/media_library/configuration.rb
new file mode 100644
index 0000000000..8263e2d4b4
--- /dev/null
+++ b/lib/avo/media_library/configuration.rb
@@ -0,0 +1,30 @@
+module Avo
+  module MediaLibrary
+    class Configuration
+      include ActiveSupport::Configurable
+
+      config_accessor(:visible) { true }
+      config_accessor(:enabled) { false }
+
+      def visible?
+        return false if disabled?
+
+        Avo::ExecutionContext.new(target: config[:visible]).handle
+      end
+
+      def enabled?
+        Avo::ExecutionContext.new(target: config[:enabled]).handle
+      end
+
+      def disabled? = !enabled?
+    end
+
+    def self.configuration
+      @configuration ||= Configuration.new
+    end
+
+    def self.configure
+      yield configuration
+    end
+  end
+end
diff --git a/lib/avo/resources/array_resource.rb b/lib/avo/resources/array_resource.rb
new file mode 100644
index 0000000000..2c1b86eb83
--- /dev/null
+++ b/lib/avo/resources/array_resource.rb
@@ -0,0 +1,109 @@
+module Avo
+  module Resources
+    class ArrayResource < Base
+      extend ActiveSupport::DescendantsTracker
+
+      include Avo::Concerns::FindAssociationField
+
+      delegate :model_class, to: :class
+
+      class_attribute :pagination, default: {
+        type: :array
+      }
+
+      class << self
+        def model_class
+          @@model_class ||= Object.const_set(
+            name,
+            Class.new do
+              include ActiveModel::Model
+
+              class << self
+                def primary_key = nil
+
+                def all = "Avo::Resources::#{name}".constantize.new.fetch_records
+              end
+            end
+          )
+        end
+      end
+
+      def records = []
+
+      def find_record(id, query: nil, params: nil)
+        fetched_records = fetch_records
+
+        return super(id, query: fetched_records, params:) if is_active_record_relation?(fetched_records)
+
+        fetched_records.find { |i| i.id.to_s == id.to_s }
+      end
+
+      def fetch_records(array_of_records = nil)
+        array_of_records ||= records
+        raise "Unable to fetch any #{name}" if array_of_records.nil?
+
+        # When the array of records is declared in a field's block, we need to get that block from the parent resource
+        # If there is no block try to pick those from the parent_record
+        # Fallback to resource's def records method
+        if params[:via_resource_class].present?
+          via_resource = Avo.resource_manager.get_resource(params[:via_resource_class])
+          via_record = via_resource.find_record params[:via_record_id], params: params
+          via_resource = via_resource.new record: via_record, view: :show
+          via_resource.detect_fields
+
+          association_field = find_association_field(resource: via_resource, association: route_key)
+
+          records_from_field_or_record = Avo::ExecutionContext.new(target: association_field.block).handle || via_record.try(route_key)
+
+          array_of_records = records_from_field_or_record || array_of_records
+        end
+
+        @fetched_records ||= if is_array_of_active_records?(array_of_records)
+          @@model_class = array_of_records.first.class
+          @@model_class.where(id: array_of_records.map(&:id))
+        elsif is_active_record_relation?(array_of_records)
+          @@model_class = array_of_records.try(:model)
+          array_of_records
+        else
+          # Dynamically create a class with accessors for all unique keys from the records
+          keys = array_of_records.flat_map(&:keys).uniq
+
+          Object.const_set(
+            name,
+            Class.new do
+              include ActiveModel::Model
+
+              # Dynamically define accessors
+              attr_accessor(*keys)
+
+              define_method(:to_param) do
+                id
+              end
+            end
+          )
+
+          custom_class = name.constantize
+
+          # Map the records to instances of the dynamically created class
+          array_of_records.map do |item|
+            custom_class.new(item)
+          end
+        end
+      end
+
+      def is_array_of_active_records?(array_of_records = records)
+        @is_array_of_active_records ||= array_of_records.all? { |element| element.is_a?(ActiveRecord::Base) }
+      end
+
+      def is_active_record_relation?(array_of_records = records)
+        @is_active_record_relation ||= array_of_records.is_a?(ActiveRecord::Relation)
+      end
+
+      def resource_type_array? = true
+
+      def sort_by_param = nil
+
+      def sorting_supported? = false
+    end
+  end
+end
diff --git a/lib/avo/resources/base.rb b/lib/avo/resources/base.rb
index be7fd37f5a..34e0576b42 100644
--- a/lib/avo/resources/base.rb
+++ b/lib/avo/resources/base.rb
@@ -4,6 +4,7 @@ class Base
       extend ActiveSupport::DescendantsTracker
 
       include ActionView::Helpers::UrlHelper
+      include Avo::Concerns::HasFieldDiscovery
       include Avo::Concerns::HasItems
       include Avo::Concerns::CanReplaceItems
       include Avo::Concerns::HasControls
@@ -17,6 +18,7 @@ class Base
       include Avo::Concerns::Pagination
       include Avo::Concerns::ControlsPlacement
       include Avo::Concerns::HasDiscreetInformation
+      include Avo::Concerns::RowControlsConfiguration
 
       # Avo::Current methods
       delegate :context, to: Avo::Current
@@ -80,7 +82,6 @@ def current_user
       class_attribute :components, default: {}
       class_attribute :default_sort_column, default: :created_at
       class_attribute :default_sort_direction, default: :desc
-      class_attribute :controls_placement, default: nil
       class_attribute :external_link, default: nil
 
       # EXTRACT:
@@ -654,6 +655,20 @@ def get_external_link
         Avo::ExecutionContext.new(target: external_link, resource: self, record: record).handle
       end
 
+      def resource_type_array? = false
+
+      def sort_by_param
+        available_columns = model_class.column_names
+
+        if available_columns.include?(default_sort_column.to_s)
+          default_sort_column
+        elsif available_columns.include?("created_at")
+          :created_at
+        end
+      end
+
+      def sorting_supported? = true
+
       private
 
       def flatten_keys(array)
diff --git a/lib/avo/resources/items/holder.rb b/lib/avo/resources/items/holder.rb
index 4262e9b19c..fc8656efc3 100644
--- a/lib/avo/resources/items/holder.rb
+++ b/lib/avo/resources/items/holder.rb
@@ -24,13 +24,21 @@ def field(field_name, **args, &block)
     if field_parser.invalid?
       as = args.fetch(:as, nil)
 
+      alert_type = :error
+      message = "There's an invalid field configuration for this resource. <br/> <code class='px-1 py-px rounded bg-red-600'>field :#{field_name}, as: :#{as}</code>"
+
+      if as == :markdown
+        alert_type = :warning
+        message = "In Avo 3.16.2 we renamed the <code>:markdown</code> field to <code>:easy_mde</code>. <br/><br/>You may continue to use that one or the new and improved one with Active Storage support. <br/><br/> Read more about it in the <a href=\"https://docs.avohq.io/3.0/fields/markdown.html\" target=\"_blank\">docs</a>."
+      end
+
       # End execution ehre and add the field to the invalid_fileds payload so we know to wanr the developer about that.
       # @todo: Make sure this warning is still active
       return add_invalid_field({
         name: field_name,
-        as: as,
-        # resource: resource_class.name,
-        message: "There's an invalid field configuration for this resource. <br/> <code class='px-1 py-px rounded bg-red-600'>field :#{field_name}, as: :#{as}</code>"
+        as:,
+        alert_type:,
+        message:
       })
     end
 
@@ -88,7 +96,7 @@ def add_item(instance)
 
   private
 
-  def add_invalid_field(payload)
+  def add_invalid_field(payload, alert_type: :error)
     invalid_fields << payload
   end
 
diff --git a/lib/avo/resources/items/sidebar.rb b/lib/avo/resources/items/sidebar.rb
index 0e894cfd88..e1927e3d2a 100644
--- a/lib/avo/resources/items/sidebar.rb
+++ b/lib/avo/resources/items/sidebar.rb
@@ -1,6 +1,7 @@
 class Avo::Resources::Items::Sidebar
   prepend Avo::Concerns::IsResourceItem
 
+  include Avo::Concerns::HasFieldDiscovery
   include Avo::Concerns::HasItems
   include Avo::Concerns::HasItemType
   include Avo::Concerns::IsVisible
@@ -26,6 +27,7 @@ def panel_wrapper?
 
   class Builder
     include Avo::Concerns::BorrowItemsHolder
+    include Avo::Concerns::HasFieldDiscovery
 
     delegate :field, to: :items_holder
     delegate :tool, to: :items_holder
diff --git a/lib/avo/resources/items/tab.rb b/lib/avo/resources/items/tab.rb
index fad0a245fe..0e5ab610e8 100644
--- a/lib/avo/resources/items/tab.rb
+++ b/lib/avo/resources/items/tab.rb
@@ -10,6 +10,7 @@ class Avo::Resources::Items::Tab
   delegate :items, :add_item, to: :items_holder
 
   attr_accessor :description
+  attr_reader :lazy_load
 
   def initialize(name: nil, description: nil, view: nil, **args)
     @name = name
@@ -18,6 +19,7 @@ def initialize(name: nil, description: nil, view: nil, **args)
     @view = Avo::ViewInquirer.new view
     @args = args
     @visible = args[:visible]
+    @lazy_load = args[:lazy_load]
 
     post_initialize if respond_to?(:post_initialize)
   end
diff --git a/lib/avo/resources/resource_manager.rb b/lib/avo/resources/resource_manager.rb
index 8eada1bd12..530858aa1a 100644
--- a/lib/avo/resources/resource_manager.rb
+++ b/lib/avo/resources/resource_manager.rb
@@ -40,7 +40,12 @@ def fetch_resources
             load_resources_namespace
           end
 
-          BaseResource.descendants
+          # All descendants from Avo::Resources::Base except the internal ones
+          Base.descendants - internal_resources
+        end
+
+        def internal_resources
+          [Avo::BaseResource, Avo::Resources::ArrayResource]
         end
 
         def load_resources_namespace
diff --git a/lib/avo/version.rb b/lib/avo/version.rb
index de6ee86a35..ed74c9ddca 100644
--- a/lib/avo/version.rb
+++ b/lib/avo/version.rb
@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "3.16.1" unless const_defined?(:VERSION)
+  VERSION = "3.17.6" unless const_defined?(:VERSION)
 end
diff --git a/lib/generators/avo/concerns/parent_controller.rb b/lib/generators/avo/concerns/parent_controller.rb
index 4ef115b35d..80d392b0d2 100644
--- a/lib/generators/avo/concerns/parent_controller.rb
+++ b/lib/generators/avo/concerns/parent_controller.rb
@@ -12,6 +12,8 @@ module ParentController
         end
 
         def parent_controller
+          return "Avo::ArrayController" if options["array"]
+
           options["parent-controller"] || ::Avo.configuration.resource_parent_controller
         end
       end
diff --git a/lib/generators/avo/resource_generator.rb b/lib/generators/avo/resource_generator.rb
index d67559bbf5..16b36d79a6 100644
--- a/lib/generators/avo/resource_generator.rb
+++ b/lib/generators/avo/resource_generator.rb
@@ -17,6 +17,11 @@ class ResourceGenerator < NamedBaseGenerator
         type: :string,
         required: false
 
+      class_option "array",
+        desc: "Indicates if the resource should be an array.",
+        type: :boolean,
+        default: false
+
       def create
         return if override_controller?
 
@@ -25,6 +30,14 @@ def create
       end
 
       no_tasks do
+        def parent_resource
+          if options["array"]
+            "Avo::Resources::ArrayResource"
+          else
+            "Avo::BaseResource"
+          end
+        end
+
         def can_connect_to_the_database?
           result = false
           begin
@@ -175,7 +188,7 @@ def fields_from_model_associations
             fields[name] = if association.is_a? ActiveRecord::Reflection::ThroughReflection
               field_from_through_association(association)
             else
-              associations_mapping[association.class]
+              ::Avo::Mappings::ASSOCIATIONS_MAPPING[association.class]
             end
           end
         end
@@ -198,7 +211,7 @@ def field_from_through_association(association)
 
         def fields_from_model_attachements
           attachments.each do |name, attachment|
-            fields[remove_last_word_from name] = attachments_mapping[attachment.class]
+            fields[remove_last_word_from name] = ::Avo::Mappings::ATTACHMENTS_MAPPING[attachment.class]
           end
         end
 
@@ -228,115 +241,6 @@ def fields_from_model_db_columns
           end
         end
 
-        def associations_mapping
-          {
-            ActiveRecord::Reflection::BelongsToReflection => {
-              field: "belongs_to"
-            },
-            ActiveRecord::Reflection::HasOneReflection => {
-              field: "has_one"
-            },
-            ActiveRecord::Reflection::HasManyReflection => {
-              field: "has_many"
-            },
-            ActiveRecord::Reflection::HasAndBelongsToManyReflection => {
-              field: "has_and_belongs_to_many"
-            }
-          }
-        end
-
-        def attachments_mapping
-          {
-            ActiveRecord::Reflection::HasOneReflection => {
-              field: "file"
-            },
-            ActiveRecord::Reflection::HasManyReflection => {
-              field: "files"
-            }
-          }
-        end
-
-        def names_mapping
-          {
-            id: {
-              field: "id"
-            },
-            description: {
-              field: "textarea"
-            },
-            gravatar: {
-              field: "gravatar"
-            },
-            email: {
-              field: "text"
-            },
-            password: {
-              field: "password"
-            },
-            password_confirmation: {
-              field: "password"
-            },
-            stage: {
-              field: "select"
-            },
-            budget: {
-              field: "currency"
-            },
-            money: {
-              field: "currency"
-            },
-            country: {
-              field: "country"
-            }
-          }
-        end
-
-        def fields_mapping
-          {
-            primary_key: {
-              field: "id"
-            },
-            string: {
-              field: "text"
-            },
-            text: {
-              field: "textarea"
-            },
-            integer: {
-              field: "number"
-            },
-            float: {
-              field: "number"
-            },
-            decimal: {
-              field: "number"
-            },
-            datetime: {
-              field: "date_time"
-            },
-            timestamp: {
-              field: "date_time"
-            },
-            time: {
-              field: "date_time"
-            },
-            date: {
-              field: "date"
-            },
-            binary: {
-              field: "number"
-            },
-            boolean: {
-              field: "boolean"
-            },
-            references: {
-              field: "belongs_to"
-            },
-            json: {
-              field: "code"
-            }
-          }
-        end
         def generate_fields
           return generate_fields_from_args if invoked_by_model_generator?
           return unless can_connect_to_the_database?
@@ -385,7 +289,7 @@ def generate_fields_from_args
         end
 
         def field(name, type)
-          names_mapping[name.to_sym] || fields_mapping[type&.to_sym] || {field: "text"}
+          ::Avo::Mappings::NAMES_MAPPING[name.to_sym] || ::Avo::Mappings::FIELDS_MAPPING[type&.to_sym] || {field: "text"}
         end
       end
     end
diff --git a/lib/generators/avo/templates/initializer/avo.tt b/lib/generators/avo/templates/initializer/avo.tt
index dfe93766d4..5394bd5f00 100644
--- a/lib/generators/avo/templates/initializer/avo.tt
+++ b/lib/generators/avo/templates/initializer/avo.tt
@@ -47,7 +47,11 @@ Avo.configure do |config|
   # config.locale = 'en-US'
 
   ## == Resource options ==
-  # config.resource_controls_placement = :right
+  # config.resource_row_controls_config = {
+  #   placement: :right,
+  #   float: false,
+  #   show_on_hover: false
+  # }.freeze
   # config.model_resource_mapping = {}
   # config.default_view_type = :table
   # config.per_page = 24
diff --git a/lib/generators/avo/templates/locales/avo.ar.yml b/lib/generators/avo/templates/locales/avo.ar.yml
index 9c132a9fc1..00c5b43005 100644
--- a/lib/generators/avo/templates/locales/avo.ar.yml
+++ b/lib/generators/avo/templates/locales/avo.ar.yml
@@ -28,6 +28,7 @@ ar:
     choose_item: اختر %{item}
     clear_value: مسح القيمة
     click_to_reveal_filters: انقر لإظهار المرشحات
+    close: إغلاق
     close_modal: أغلق النافذة
     confirm: تأكيد
     copy: نسخ
@@ -71,6 +72,8 @@ ar:
     less_content: محتوى أقل
     list_is_empty: القائمة فارغة
     loading: جاري التحميل
+    media_library:
+      title: مكتبة الوسائط
     more: المزيد
     more_content: المزيد من المحتوى
     more_records_available: هناك المزيد من السجلات المتاحة.
diff --git a/lib/generators/avo/templates/locales/avo.de.yml b/lib/generators/avo/templates/locales/avo.de.yml
index 7b470689e7..35ea2ff2c3 100644
--- a/lib/generators/avo/templates/locales/avo.de.yml
+++ b/lib/generators/avo/templates/locales/avo.de.yml
@@ -22,6 +22,7 @@ de:
     choose_item: "%{item} auswählen"
     clear_value: Wert löschen
     click_to_reveal_filters: Klicken, um Filter anzuzeigen
+    close: Schließen
     close_modal: Modal schließen
     confirm: Bestätigen
     copy: Kopieren
@@ -61,6 +62,8 @@ de:
     less_content: Weniger Inhalt
     list_is_empty: Liste ist leer
     loading: Lade...
+    media_library:
+      title: Medienbibliothek
     more: Mehr
     more_content: Mehr Inhalt
     more_records_available: Es sind weitere Datensätze verfügbar.
diff --git a/lib/generators/avo/templates/locales/avo.en.yml b/lib/generators/avo/templates/locales/avo.en.yml
index ca4b5e87e2..b6fa650c94 100644
--- a/lib/generators/avo/templates/locales/avo.en.yml
+++ b/lib/generators/avo/templates/locales/avo.en.yml
@@ -22,6 +22,7 @@ en:
     choose_item: Choose %{item}
     clear_value: Clear value
     click_to_reveal_filters: Click to reveal filters
+    close: Close
     close_modal: Close modal
     confirm: Confirm
     copy: Copy
@@ -61,6 +62,8 @@ en:
     less_content: Less content
     list_is_empty: List is empty
     loading: Loading
+    media_library:
+      title: Media Library
     more: More
     more_content: More content
     more_records_available: There are more records available.
diff --git a/lib/generators/avo/templates/locales/avo.es.yml b/lib/generators/avo/templates/locales/avo.es.yml
index 5b8f4f968e..3b26bfa1ef 100644
--- a/lib/generators/avo/templates/locales/avo.es.yml
+++ b/lib/generators/avo/templates/locales/avo.es.yml
@@ -24,6 +24,7 @@ es:
     choose_item: Elige %{item}
     clear_value: Borrar el valor
     click_to_reveal_filters: Pulsa para mostrar los filtros
+    close: Cerrar
     close_modal: Cerrar modal
     confirm: Confirmar
     copy: Copiar
@@ -63,6 +64,8 @@ es:
     less_content: Menos contenido
     list_is_empty: La lista está vacía
     loading: Cargando
+    media_library:
+      title: Biblioteca de medios
     more: Más
     more_content: Más contenido
     more_records_available: Hay más registros disponibles.
diff --git a/lib/generators/avo/templates/locales/avo.fr.yml b/lib/generators/avo/templates/locales/avo.fr.yml
index 469734a976..64cf8360c8 100644
--- a/lib/generators/avo/templates/locales/avo.fr.yml
+++ b/lib/generators/avo/templates/locales/avo.fr.yml
@@ -24,6 +24,7 @@ fr:
     choose_item: Choisir %{item}
     clear_value: Effacer la valeur
     click_to_reveal_filters: Cliquez pour révéler les filtres
+    close: Fermer
     close_modal: Fermer la fenêtre modale
     confirm: Confirmer
     copy: Copier
@@ -63,6 +64,8 @@ fr:
     less_content: Moins de contenu
     list_is_empty: La liste est vide
     loading: Chargement
+    media_library:
+      title: Bibliothèque multimédia
     more: Plus
     more_content: Plus de contenu
     more_records_available: Il y a plus d'enregistrements disponibles.
diff --git a/lib/generators/avo/templates/locales/avo.it.yml b/lib/generators/avo/templates/locales/avo.it.yml
index 4948c695b3..088ab48029 100644
--- a/lib/generators/avo/templates/locales/avo.it.yml
+++ b/lib/generators/avo/templates/locales/avo.it.yml
@@ -22,6 +22,7 @@ it:
     choose_item: Scegli %{item}
     clear_value: Cancella valore
     click_to_reveal_filters: Clicca per mostrare i filtri
+    close: Chiudi
     close_modal: Chiudi modale
     confirm: Conferma
     copy: Copia
@@ -61,6 +62,8 @@ it:
     less_content: Meno contenuti
     list_is_empty: La lista è vuota
     loading: Caricamento in corso
+    media_library:
+      title: Libreria multimediale
     more: Altro
     more_content: Più contenuti
     more_records_available: Sono disponibili più record.
diff --git a/lib/generators/avo/templates/locales/avo.ja.yml b/lib/generators/avo/templates/locales/avo.ja.yml
index 29503a65c4..8b6516a595 100644
--- a/lib/generators/avo/templates/locales/avo.ja.yml
+++ b/lib/generators/avo/templates/locales/avo.ja.yml
@@ -24,6 +24,7 @@ ja:
     choose_item: "%{item}を選択"
     clear_value: 値をクリア
     click_to_reveal_filters: フィルターを表示するにはクリック
+    close: 閉じる
     close_modal: モーダルを閉じる
     confirm: 確認
     copy: コピー
@@ -63,6 +64,8 @@ ja:
     less_content: コンテンツが少ない
     list_is_empty: リストは空です
     loading: 読み込み中
+    media_library:
+      title: メディアライブラリ
     more: もっと
     more_content: さらなるコンテンツ
     more_records_available: さらに多くのレコードが利用可能です。
diff --git a/lib/generators/avo/templates/locales/avo.nb.yml b/lib/generators/avo/templates/locales/avo.nb.yml
index 804688b0ef..3b5f59bb02 100644
--- a/lib/generators/avo/templates/locales/avo.nb.yml
+++ b/lib/generators/avo/templates/locales/avo.nb.yml
@@ -24,6 +24,7 @@ nb:
     choose_item: Velge %{item}
     clear_value: Nullstill verdi
     click_to_reveal_filters: Vis filter
+    close: Lukk
     close_modal: Lukk modal
     confirm: Bekreft
     copy: Kopier
@@ -63,6 +64,8 @@ nb:
     less_content: Mindre innhold
     list_is_empty: Listen er tom
     loading: Laster
+    media_library:
+      title: Mediebibliotek
     more: Mer
     more_content: Mer innhold
     more_records_available: Det er flere poster tilgjengelig.
diff --git a/lib/generators/avo/templates/locales/avo.nl.yml b/lib/generators/avo/templates/locales/avo.nl.yml
index 3cf83b2f0a..dcaf35263c 100644
--- a/lib/generators/avo/templates/locales/avo.nl.yml
+++ b/lib/generators/avo/templates/locales/avo.nl.yml
@@ -22,6 +22,7 @@ nl:
     choose_item: Kies %{item}
     clear_value: Waarde wissen
     click_to_reveal_filters: Klik om filters te tonen
+    close: Sluiten
     close_modal: Modaal sluiten
     confirm: Bevestigen
     copy: Kopie
@@ -61,6 +62,8 @@ nl:
     less_content: Minder inhoud
     list_is_empty: Lijst is leeg
     loading: Laden...
+    media_library:
+      title: Mediabibliotheek
     more: Meer
     more_content: Meer inhoud
     more_records_available: Er zijn meer records beschikbaar.
diff --git a/lib/generators/avo/templates/locales/avo.nn.yml b/lib/generators/avo/templates/locales/avo.nn.yml
index 91006ffc43..e5b9098427 100644
--- a/lib/generators/avo/templates/locales/avo.nn.yml
+++ b/lib/generators/avo/templates/locales/avo.nn.yml
@@ -24,6 +24,7 @@ nn:
     choose_item: Vel %{item}
     clear_value: Nullstill verdi
     click_to_reveal_filters: Vis filter
+    close: Lukk
     close_modal: Lukk modal
     confirm: Stadfest
     copy: Kopier
@@ -63,6 +64,8 @@ nn:
     less_content: Mindre innhold
     list_is_empty: Lista er tom
     loading: Lastar
+    media_library:
+      title: Media bibliotek
     more: Meir
     more_content: Mer innhold
     more_records_available: Det finst fleire opptak tilgjengelege.
diff --git a/lib/generators/avo/templates/locales/avo.pl.yml b/lib/generators/avo/templates/locales/avo.pl.yml
index 225c5e1d8a..4f3a0189da 100644
--- a/lib/generators/avo/templates/locales/avo.pl.yml
+++ b/lib/generators/avo/templates/locales/avo.pl.yml
@@ -22,6 +22,7 @@ pl:
     choose_item: Wybierz %{item}
     clear_value: Wyczyść wartość
     click_to_reveal_filters: Kliknij, aby pokazać filtry
+    close: Zamknij
     close_modal: Zamknij okno modalne
     confirm: Potwierdź
     copy: Kopiuj
@@ -63,6 +64,8 @@ pl:
     less_content: Pokaż mniej
     list_is_empty: Lista jest pusta
     loading: Ładowanie
+    media_library:
+      title: Biblioteka mediów
     more: Więcej
     more_content: Pokaż wiecej
     more_records_available: Dostępnych jest więcej rekordów.
diff --git a/lib/generators/avo/templates/locales/avo.pt-BR.yml b/lib/generators/avo/templates/locales/avo.pt-BR.yml
index 6fc43325d4..82d220bb10 100644
--- a/lib/generators/avo/templates/locales/avo.pt-BR.yml
+++ b/lib/generators/avo/templates/locales/avo.pt-BR.yml
@@ -24,6 +24,7 @@ pt-BR:
     choose_item: Escolher %{item}
     clear_value: Limpar valor
     click_to_reveal_filters: Clique para revelar os filtros
+    close: Fechar
     close_modal: Fechar modal
     confirm: Confirmar
     copy: Copiar
@@ -63,6 +64,8 @@ pt-BR:
     less_content: Menos conteúdo
     list_is_empty: Lista vazia
     loading: Carregando
+    media_library:
+      title: Biblioteca de Mídia
     more: Mais
     more_content: Mais conteúdo
     more_records_available: Existem mais registros disponíveis.
diff --git a/lib/generators/avo/templates/locales/avo.pt.yml b/lib/generators/avo/templates/locales/avo.pt.yml
index 1af99f480c..bb163a138d 100644
--- a/lib/generators/avo/templates/locales/avo.pt.yml
+++ b/lib/generators/avo/templates/locales/avo.pt.yml
@@ -24,6 +24,7 @@ pt:
     choose_item: Escolher %{item}
     clear_value: Apagar valor
     click_to_reveal_filters: Clique para mostrar os filtros
+    close: Fechar
     close_modal: Fechar modal
     confirm: Confirmar
     copy: Copiar
@@ -63,6 +64,8 @@ pt:
     less_content: Menos conteúdo
     list_is_empty: Lista vazia
     loading: A carregar
+    media_library:
+      title: Biblioteca de Mídia
     more: Mais
     more_content: Mais conteúdo
     more_records_available: Existem mais registos disponíveis.
diff --git a/lib/generators/avo/templates/locales/avo.ro.yml b/lib/generators/avo/templates/locales/avo.ro.yml
index 0e55df44f2..027d0fff1d 100644
--- a/lib/generators/avo/templates/locales/avo.ro.yml
+++ b/lib/generators/avo/templates/locales/avo.ro.yml
@@ -25,6 +25,7 @@ ro:
     choose_item: Alege %{item}
     clear_value: Șterge valoarea
     click_to_reveal_filters: Faceți clic pentru a afișa filtrele
+    close: Închide
     close_modal: Închide modalul
     confirm: Confirm
     copy: Copiază
@@ -65,6 +66,8 @@ ro:
     less_content: Mai puțin conținut
     list_is_empty: Lista este goală
     loading: Se incarcă
+    media_library:
+      title: Bibliotecă media
     more: Mai multe
     more_content: Mai mult conținut
     more_records_available: Sunt mai multe înregistrări disponibile.
diff --git a/lib/generators/avo/templates/locales/avo.ru.yml b/lib/generators/avo/templates/locales/avo.ru.yml
index 4176255b50..f939543240 100644
--- a/lib/generators/avo/templates/locales/avo.ru.yml
+++ b/lib/generators/avo/templates/locales/avo.ru.yml
@@ -22,6 +22,7 @@ ru:
     choose_item: Выбрать %{item}
     clear_value: Очистить значение
     click_to_reveal_filters: Нажмите, чтобы открыть фильтры
+    close: Закрыть
     close_modal: Закрыть модальное окно
     confirm: Подтвердить
     copy: Копировать
@@ -63,6 +64,8 @@ ru:
     less_content: Меньше контента
     list_is_empty: Список пуст
     loading: Загрузка...
+    media_library:
+      title: Медиатека
     more: Ещё
     more_content: Больше контента
     more_records_available: Доступно больше записей.
diff --git a/lib/generators/avo/templates/locales/avo.tr.yml b/lib/generators/avo/templates/locales/avo.tr.yml
index 85736fe6cc..edfcc498cb 100644
--- a/lib/generators/avo/templates/locales/avo.tr.yml
+++ b/lib/generators/avo/templates/locales/avo.tr.yml
@@ -24,6 +24,7 @@ tr:
     choose_item: "%{item} seçin"
     clear_value: Değeri temizle
     click_to_reveal_filters: Filtreleri ortaya çıkarmak için tıklayın
+    close: Kapat
     close_modal: Modali kapat
     confirm: Onayla
     copy: Kopya
@@ -63,6 +64,8 @@ tr:
     less_content: Daha az içerik
     list_is_empty: Boş liste
     loading: Yükleniyor
+    media_library:
+      title: Ortam Kütüphanesi
     more: Daha fazla
     more_content: Daha fazla içerik
     more_records_available: Daha fazla kayıt mevcut.
diff --git a/lib/generators/avo/templates/locales/avo.uk.yml b/lib/generators/avo/templates/locales/avo.uk.yml
index f3bbb8f73f..4fdc4a0724 100644
--- a/lib/generators/avo/templates/locales/avo.uk.yml
+++ b/lib/generators/avo/templates/locales/avo.uk.yml
@@ -22,6 +22,7 @@ uk:
     choose_item: Виберіть %{item}
     clear_value: Очистити значення
     click_to_reveal_filters: Натисніть, щоб показати фільтри
+    close: Закрити
     close_modal: Закрити вікно
     confirm: Підтвердити
     copy: Копіювати
@@ -63,6 +64,8 @@ uk:
     less_content: Менше вмісту
     list_is_empty: Список порожній
     loading: Завантаження
+    media_library:
+      title: Медіатека
     more: Ще
     more_content: Більше вмісту
     more_records_available: Є більше доступних записів.
diff --git a/lib/generators/avo/templates/locales/avo.zh.yml b/lib/generators/avo/templates/locales/avo.zh.yml
index 9e6b8b4070..5910022bc0 100644
--- a/lib/generators/avo/templates/locales/avo.zh.yml
+++ b/lib/generators/avo/templates/locales/avo.zh.yml
@@ -22,6 +22,7 @@ zh:
     choose_item: 选择 %{item}
     clear_value: 清除值
     click_to_reveal_filters: 点击以显示筛选器
+    close: 关闭
     close_modal: 关闭模态框
     confirm: 确认
     copy: 复制
@@ -61,6 +62,8 @@ zh:
     less_content: 内容较少
     list_is_empty: 列表为空
     loading: 加载中...
+    media_library:
+      title: 媒体库
     more: 更多
     more_content: 更多内容
     more_records_available: 还有更多记录可供参考。
diff --git a/lib/generators/avo/templates/resource/resource.tt b/lib/generators/avo/templates/resource/resource.tt
index a583f44436..7982da1668 100644
--- a/lib/generators/avo/templates/resource/resource.tt
+++ b/lib/generators/avo/templates/resource/resource.tt
@@ -1,11 +1,30 @@
-class Avo::Resources::<%= resource_class %> < Avo::BaseResource
+class Avo::Resources::<%= resource_class %> < <%= parent_resource %><% if options["array"] %>
+  def records
+    [
+      {
+        id: 1,
+        title: "Example 1"
+      },
+      {
+        id: 2,
+        title: "Example 2"
+      }
+    ]
+  end
+  <% else %>
   # self.includes = []
   # self.attachments = []<%= model_class_from_args %>
   # self.search = {
   #   query: -> { query.ransack(id_eq: params[:q], m: "or").result(distinct: false) }
   # }
-
+  <% end %><% if options["array"] %>
+  def fields
+    field :id, as: :id
+    field :title
+  end<% else %>
   def fields
     field :id, as: :id<%= generate_fields %>
-  end
+  end<% end %>
 end
+
+
diff --git a/lib/tasks/avo_tasks.rake b/lib/tasks/avo_tasks.rake
index 75bde4797a..b4069dfbeb 100644
--- a/lib/tasks/avo_tasks.rake
+++ b/lib/tasks/avo_tasks.rake
@@ -133,6 +133,7 @@ end
 desc "Installs yarn dependencies for Avo"
 task "avo:yarn_install" do
   # tailwind.preset.js needs this dependencies in order to be required
+  # Ensure that versions remain updated and synchronized with those specified in package.json.
   puts "[Avo->] Adding yarn dependencies"
-  `yarn add tailwindcss @tailwindcss/forms @tailwindcss/typography --cwd #{Avo::Engine.root}`
+  `yarn add tailwindcss@^3.4.17 @tailwindcss/forms@^0.5.10 @tailwindcss/typography@^0.5.16 @tailwindcss/container-queries@^0.1.1 --cwd #{Avo::Engine.root}`
 end
diff --git a/package.json b/package.json
index bcf7c1c065..93a9cbe3e3 100644
--- a/package.json
+++ b/package.json
@@ -27,24 +27,25 @@
     "@rails/activestorage": "^6.1.710",
     "@stimulus-components/clipboard": "^5.0.0",
     "@stimulus-components/password-visibility": "^3.0.0",
+    "@tailwindcss/container-queries": "^0.1.1",
     "@tailwindcss/forms": "^0.5.10",
     "@tailwindcss/typography": "^0.5.16",
-    "@tiptap/core": "^2.11.2",
-    "@tiptap/extension-bold": "^2.11.2",
-    "@tiptap/extension-bullet-list": "^2.11.2",
-    "@tiptap/extension-document": "^2.11.2",
-    "@tiptap/extension-hard-break": "^2.11.2",
-    "@tiptap/extension-italic": "^2.11.2",
-    "@tiptap/extension-link": "^2.11.2",
-    "@tiptap/extension-list-item": "^2.11.2",
-    "@tiptap/extension-ordered-list": "^2.11.2",
-    "@tiptap/extension-paragraph": "^2.11.2",
-    "@tiptap/extension-placeholder": "^2.11.2",
-    "@tiptap/extension-strike": "^2.11.2",
-    "@tiptap/extension-text": "^2.11.2",
-    "@tiptap/extension-underline": "^2.11.2",
-    "@tiptap/pm": "^2.11.2",
-    "@yaireo/tagify": "^4.33.1",
+    "@tiptap/core": "^2.11.5",
+    "@tiptap/extension-bold": "^2.11.5",
+    "@tiptap/extension-bullet-list": "^2.11.5",
+    "@tiptap/extension-document": "^2.11.5",
+    "@tiptap/extension-hard-break": "^2.11.5",
+    "@tiptap/extension-italic": "^2.11.5",
+    "@tiptap/extension-link": "^2.11.5",
+    "@tiptap/extension-list-item": "^2.11.5",
+    "@tiptap/extension-ordered-list": "^2.11.5",
+    "@tiptap/extension-paragraph": "^2.11.5",
+    "@tiptap/extension-placeholder": "^2.11.5",
+    "@tiptap/extension-strike": "^2.11.5",
+    "@tiptap/extension-text": "^2.11.5",
+    "@tiptap/extension-underline": "^2.11.5",
+    "@tiptap/pm": "^2.11.5",
+    "@yaireo/tagify": "^4.33.2",
     "add": "^2.0.6",
     "autoprefixer": "^10.4.20",
     "chart.js": "^3.9.1",
@@ -52,10 +53,10 @@
     "codemirror": "5.59.1",
     "core-js": "^3.40.0",
     "css-loader": "^6.11.0",
-    "dompurify": "^3.2.3",
+    "dompurify": "^3.2.4",
     "easymde": "^2.18.0",
     "el-transition": "^0.0.7",
-    "esbuild": "^0.14.54",
+    "esbuild": "^0.25.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-import-resolver-alias": "^1.1.2",
     "eslint-plugin-sort-imports-es6-autofix": "^0.6.0",
@@ -67,7 +68,7 @@
     "luxon": "^3.5.0",
     "mapkick": "^0.2.6",
     "mousetrap": "^1.6.5",
-    "postcss": "^8.5.1",
+    "postcss": "^8.5.2",
     "postcss-flexbugs-fixes": "^5.0.2",
     "postcss-import": "^15.1.0",
     "postcss-loader": "^7.3.4",
@@ -87,9 +88,9 @@
     "urijs": "^1.19.11"
   },
   "devDependencies": {
-    "@babel/core": "^7.26.0",
-    "@babel/eslint-parser": "^7.26.5",
-    "@babel/preset-env": "^7.26.0",
+    "@babel/core": "^7.26.8",
+    "@babel/eslint-parser": "^7.26.8",
+    "@babel/preset-env": "^7.26.8",
     "@prettier/plugin-ruby": "^2.1.0",
     "esbuild-visualizer": "^0.3.1",
     "eslint": "^8.57.1",
diff --git a/spec/dummy/.env.sample b/spec/dummy/.env.sample
index 9012d19e6c..a6779e7ee2 100644
--- a/spec/dummy/.env.sample
+++ b/spec/dummy/.env.sample
@@ -9,5 +9,3 @@ AWS_ACCESS_KEY_ID=
 AWS_REGION=
 AWS_S3_BUCKET=
 AWS_SECRET_ACCESS_KEY=
-
-# AVO_RESOURCE_CONTROLS_PLACEMENT=right
diff --git a/spec/dummy/app/avo/actions/sub/dummy_action.rb b/spec/dummy/app/avo/actions/sub/dummy_action.rb
index c65de2b814..f103b7d7cf 100644
--- a/spec/dummy/app/avo/actions/sub/dummy_action.rb
+++ b/spec/dummy/app/avo/actions/sub/dummy_action.rb
@@ -13,6 +13,7 @@ class Avo::Actions::Sub::DummyAction < Avo::BaseAction
   end
 
   def fields
+    field :size, as: :radio, options: {small: "Small Option", medium: "Medium Option", large: "Large Option"}, default: :medium
     TestBuddy.hi("Dummy action fields")
     field :keep_modal_open, as: :boolean
     field :persistent_text, as: :text
diff --git a/spec/dummy/app/avo/actions/test/query.rb b/spec/dummy/app/avo/actions/test/query.rb
new file mode 100644
index 0000000000..564e6fce63
--- /dev/null
+++ b/spec/dummy/app/avo/actions/test/query.rb
@@ -0,0 +1,23 @@
+class Avo::Actions::Test::Query < Avo::BaseAction
+  self.name = -> {
+    "Test query access #{query&.count}"
+  }
+  self.message = -> {
+    "message #{query.count} selected"
+  }
+  self.cancel_button_label = -> {
+    "cancel_button_label #{query.count} selected"
+  }
+  self.confirm_button_label = -> {
+    "confirm_button_label #{query.count} selected"
+  }
+  self.standalone = true
+
+  def fields
+    field :selected, default: "#{query.count} selected def fields"
+  end
+
+  def handle(**args)
+    succeed "succeed #{query.count} selected"
+  end
+end
diff --git a/spec/dummy/app/avo/resources/attendee.rb b/spec/dummy/app/avo/resources/attendee.rb
new file mode 100644
index 0000000000..9a871758ff
--- /dev/null
+++ b/spec/dummy/app/avo/resources/attendee.rb
@@ -0,0 +1,21 @@
+class Avo::Resources::Attendee < Avo::Resources::ArrayResource
+  self.description = -> {
+    return "Attendees from field block" if params["resource_name"] == "events"
+    return "First 6 users" if params["resource_name"] == "courses"
+
+    "#{@record&.name || "All the users"} rendered as array resource"
+  }
+
+  # Test array resource, this method should be called only on attendees index
+  def records = User.all
+
+  def fields
+    field :id, as: :id
+    field :name
+
+    with_options visible: -> { !resource.record.is_a?(User) } do
+      field :role
+      field :organization
+    end
+  end
+end
diff --git a/spec/dummy/app/avo/resources/city.rb b/spec/dummy/app/avo/resources/city.rb
index b9fdc9087b..2ccbeb66b7 100644
--- a/spec/dummy/app/avo/resources/city.rb
+++ b/spec/dummy/app/avo/resources/city.rb
@@ -35,8 +35,16 @@ class Avo::Resources::City < Avo::BaseResource
   }
 
   def base_fields
+    field :preview, as: :preview
     field :id, as: :id
-    field :coordinates, as: :location, stored_as: [:latitude, :longitude]
+    field :coordinates,
+      as: :location,
+      show_on: :preview,
+      stored_as: [:latitude, :longitude],
+      mapkick_options: {
+        style: "mapbox://styles/mapbox/satellite-v9",
+        markers: {color: "#FFC0CB"}
+      }
     field :city_center_area,
       as: :area,
       geometry: :polygon,
@@ -91,7 +99,7 @@ def tool_fields
       field :is_capital, as: :boolean, filterable: true
       field :features, as: :key_value
       field :image_url, as: :external_image
-      field :tiny_description, as: :markdown
+      field :tiny_description, as: :easy_mde
       field :status, as: :badge, enum: ::City.statuses
     end
   end
diff --git a/spec/dummy/app/avo/resources/compact_user.rb b/spec/dummy/app/avo/resources/compact_user.rb
index fcb7995efe..619abdda4a 100644
--- a/spec/dummy/app/avo/resources/compact_user.rb
+++ b/spec/dummy/app/avo/resources/compact_user.rb
@@ -6,15 +6,11 @@ class Avo::Resources::CompactUser < Avo::BaseResource
 
   def fields
     field :personal_information, as: :heading
-
-    field :first_name, as: :text
-    field :last_name, as: :text
-    field :birthday, as: :date
+    discover_columns only: [:first_name, :last_name, :birthday]
 
     field :heading, as: :heading, label: "Contact"
+    discover_columns only: [:email]
 
-    field :email, as: :text
-
-    field :posts, as: :has_many
+    discover_associations only: [:posts]
   end
 end
diff --git a/spec/dummy/app/avo/resources/course.rb b/spec/dummy/app/avo/resources/course.rb
index 92c0580772..ee1f146484 100644
--- a/spec/dummy/app/avo/resources/course.rb
+++ b/spec/dummy/app/avo/resources/course.rb
@@ -11,6 +11,8 @@ def show_fields
     fields_bag
     field :links, as: :has_many, searchable: true, placeholder: "Click to choose a link",
       discreet_pagination: true
+
+    field :attendees, as: :array
   end
 
   def index_fields
diff --git a/spec/dummy/app/avo/resources/event.rb b/spec/dummy/app/avo/resources/event.rb
index 7ac3dfd6f1..d1b1576fc9 100644
--- a/spec/dummy/app/avo/resources/event.rb
+++ b/spec/dummy/app/avo/resources/event.rb
@@ -19,6 +19,12 @@ class Avo::Resources::Event < Avo::BaseResource
   }
   self.discreet_information = :timestamps
 
+  self.row_controls_config = {
+    float: true,
+    show_on_hover: true,
+    placement: :both
+  }
+
   def fields
     field :name, as: :text, link_to_record: true, sortable: true, stacked: true
     field :first_user,
@@ -40,5 +46,31 @@ def fields
       # Example for error message when resource is missing
       field :location, as: :belongs_to
     end
+
+    # this field demonstrated how one can use the array field to display an arbitrary array of objects as a "has_many field"
+    field :attendees, as: :array do
+      [
+        {id: 1, name: "John Doe", role: "Software Developer", organization: "TechCorp"},
+        {id: 2, name: "Jane Smith", role: "Data Scientist", organization: "DataPros"},
+        {id: 3, name: "Emily Davis", role: "Product Manager", organization: "Startup Inc."},
+        {id: 4, name: "Kevin Roberts", role: "CTO", organization: "FutureTech"},
+        {id: 5, name: "Sarah Johnson", role: "UI/UX Designer", organization: "DesignWorks"},
+        {id: 6, name: "Michael Lee", role: "Backend Engineer", organization: "CodeBase"},
+        {id: 7, name: "Olivia Brown", role: "Project Coordinator", organization: "BuildIt"},
+        {id: 8, name: "Ethan Williams", role: "AI Specialist", organization: "InnoBots"},
+        {id: 9, name: "Sophia Martinez", role: "Marketing Strategist", organization: "Brandify"},
+        {id: 10, name: "Jacob Wilson", role: "DevOps Engineer", organization: "OpsWorld"},
+        {id: 11, name: "Ava Taylor", role: "Business Analyst", organization: "AnalyzeNow"},
+        {id: 12, name: "William Hernandez", role: "Full Stack Developer", organization: "Webify"},
+        {id: 13, name: "Mia Moore", role: "HR Manager", organization: "PeopleFirst"},
+        {id: 14, name: "James Anderson", role: "Blockchain Developer", organization: "ChainWorks"},
+        {id: 15, name: "Charlotte White", role: "Product Designer", organization: "Cre8tive"},
+        {id: 16, name: "Benjamin Green", role: "Cybersecurity Analyst", organization: "SecureNet"},
+        {id: 17, name: "Amelia Clark", role: "Data Engineer", organization: "BigData Solutions"},
+        {id: 18, name: "Lucas Carter", role: "Scrum Master", organization: "AgileHub"},
+        {id: 19, name: "Ella Thompson", role: "Software Architect", organization: "CodeVision"},
+        {id: 20, name: "Alexander Scott", role: "Solutions Consultant", organization: "Innovate Consulting"}
+      ]
+    end
   end
 end
diff --git a/spec/dummy/app/avo/resources/field_discovery_user.rb b/spec/dummy/app/avo/resources/field_discovery_user.rb
new file mode 100644
index 0000000000..ec05c17daf
--- /dev/null
+++ b/spec/dummy/app/avo/resources/field_discovery_user.rb
@@ -0,0 +1,35 @@
+class Avo::Resources::FieldDiscoveryUser < Avo::BaseResource
+  self.model_class = ::User
+  self.description = "This is a resource with discovered fields. It will show fields and associations as defined in the model."
+  self.find_record_method = -> {
+    query.friendly.find id
+  }
+
+  def fields
+    main_panel do
+      discover_columns except: %i[email active is_admin? birthday is_writer outside_link custom_css]
+      discover_associations only: %i[cv_attachment]
+
+      sidebar do
+        with_options only_on: :show do
+          discover_columns only: %i[email], as: :gravatar, link_to_record: true, as_avatar: :circle
+          field :heading, as: :heading, label: ""
+          discover_columns only: %i[active], name: "Is active"
+        end
+
+        discover_columns only: %i[birthday]
+
+        field :password, as: :password, name: "User Password", required: false, only_on: :forms, help: 'You may verify the password strength <a href="http://www.passwordmeter.com/" target="_blank">here</a>.'
+        field :password_confirmation, as: :password, name: "Password confirmation", required: false, revealable: true
+
+        with_options only_on: :forms do
+          field :dev, as: :heading, label: '<div class="underline uppercase font-bold">DEV</div>', as_html: true
+          discover_columns only: %i[custom_css]
+        end
+      end
+    end
+
+    discover_associations only: %i[posts]
+    discover_associations except: %i[posts post cv_attachment]
+  end
+end
diff --git a/spec/dummy/app/avo/resources/movie.rb b/spec/dummy/app/avo/resources/movie.rb
new file mode 100644
index 0000000000..0451feab13
--- /dev/null
+++ b/spec/dummy/app/avo/resources/movie.rb
@@ -0,0 +1,284 @@
+class Avo::Resources::Movie < Avo::Resources::ArrayResource
+  # self.includes = []
+  # self.attachments = []
+  # self.search = {
+  #   query: -> { query.ransack(id_eq: params[:q], m: "or").result(distinct: false) }
+  # }
+
+  def records
+    [
+      {
+        id: 1,
+        name: "The Shawshank Redemption",
+        release_date: "1994-09-23"
+      },
+      {
+        id: 2,
+        name: "The Godfather",
+        release_date: "1972-03-24",
+        fun_fact: "The iconic cat in the opening scene was a stray found by director Francis Ford Coppola on the studio lot."
+      },
+      {
+        id: 3,
+        name: "Pulp Fiction",
+        release_date: "1994-10-14"
+      },
+      {
+        id: 4,
+        name: "The Dark Knight",
+        release_date: "2008-07-18"
+      },
+      {
+        id: 5,
+        name: "Fight Club",
+        release_date: "1999-10-15"
+      },
+      {
+        id: 6,
+        name: "Inception",
+        release_date: "2010-07-16"
+      },
+      {
+        id: 7,
+        name: "The Matrix",
+        release_date: "1999-03-31",
+        fun_fact: "The actors trained in martial arts for months before shooting to perform many of their own stunts."
+      },
+      {
+        id: 8,
+        name: "Goodfellas",
+        release_date: "1990-09-19"
+      },
+      {
+        id: 9,
+        name: "The Silence of the Lambs",
+        release_date: "1991-02-14"
+      },
+      {
+        id: 10,
+        name: "Interstellar",
+        release_date: "2014-11-07"
+      },
+      {
+        id: 11,
+        name: "The Lion King",
+        release_date: "1994-06-24"
+      },
+      {
+        id: 12,
+        name: "Forrest Gump",
+        release_date: "1994-07-06"
+      },
+      {
+        id: 13,
+        name: "Jurassic Park",
+        release_date: "1993-06-11"
+      },
+      {
+        id: 14,
+        name: "Titanic",
+        release_date: "1997-12-19"
+      },
+      {
+        id: 15,
+        name: "Avatar",
+        release_date: "2009-12-18"
+      },
+      {
+        id: 16,
+        name: "The Avengers",
+        release_date: "2012-05-04"
+      },
+      {
+        id: 17,
+        name: "Star Wars: Episode IV - A New Hope",
+        release_date: "1977-05-25"
+      },
+      {
+        id: 18,
+        name: "Back to the Future",
+        release_date: "1985-07-03"
+      },
+      {
+        id: 19,
+        name: "Gladiator",
+        release_date: "2000-05-05"
+      },
+      {
+        id: 20,
+        name: "The Lord of the Rings: The Fellowship of the Ring",
+        release_date: "2001-12-19"
+      },
+      {
+        id: 21,
+        name: "The Departed",
+        release_date: "2006-10-06"
+      },
+      {
+        id: 22,
+        name: "Schindler\"s List",
+        release_date: "1993-12-15"
+      },
+      {
+        id: 23,
+        name: "The Green Mile",
+        release_date: "1999-12-10"
+      },
+      {
+        id: 24,
+        name: "Saving Private Ryan",
+        release_date: "1998-07-24"
+      },
+      {
+        id: 25,
+        name: "The Social Network",
+        release_date: "2010-10-01"
+      },
+      {
+        id: 26,
+        name: "The Prestige",
+        release_date: "2006-10-20"
+      },
+      {
+        id: 27,
+        name: "The Grand Budapest Hotel",
+        release_date: "2014-03-07"
+      },
+      {
+        id: 28,
+        name: "La La Land",
+        release_date: "2016-12-09",
+        fun_fact: "Ryan Gosling learned to play the piano for his role, mastering several songs within three months."
+      },
+      {
+        id: 29,
+        name: "Get Out",
+        release_date: "2017-02-24"
+      },
+      {
+        id: 30,
+        name: "Parasite",
+        release_date: "2019-10-11",
+        fun_fact: "It became the first non-English language film to win the Academy Award for Best Picture."
+      },
+      {
+        id: 31,
+        name: "Whiplash",
+        release_date: "2014-10-10"
+      },
+      {
+        id: 32,
+        name: "Mad Max: Fury Road",
+        release_date: "2015-05-15"
+      },
+      {
+        id: 33,
+        name: "The Shape of Water",
+        release_date: "2017-12-01"
+      },
+      {
+        id: 34,
+        name: "Black Panther",
+        release_date: "2018-02-16",
+        fun_fact: "The Wakandan language is based on the real South African language, Xhosa."
+      },
+      {
+        id: 35,
+        name: "Moonlight",
+        release_date: "2016-10-21"
+      },
+      {
+        id: 36,
+        name: "A Beautiful Mind",
+        release_date: "2001-12-21"
+      },
+      {
+        id: 37,
+        name: "The Wolf of Wall Street",
+        release_date: "2013-12-25"
+      },
+      {
+        id: 38,
+        name: "No Country for Old Men",
+        release_date: "2007-11-09"
+      },
+      {
+        id: 39,
+        name: "There Will Be Blood",
+        release_date: "2007-12-26"
+      },
+      {
+        id: 40,
+        name: "The Revenant",
+        release_date: "2015-12-25"
+      },
+      {
+        id: 41,
+        name: "Django Unchained",
+        release_date: "2012-12-25"
+      },
+      {
+        id: 42,
+        name: "Inglourious Basterds",
+        release_date: "2009-08-21"
+      },
+      {
+        id: 43,
+        name: "The Pianist",
+        release_date: "2002-09-24"
+      },
+      {
+        id: 44,
+        name: "A Clockwork Orange",
+        release_date: "1971-12-19"
+      },
+      {
+        id: 45,
+        name: "The Big Lebowski",
+        release_date: "1998-03-06"
+      },
+      {
+        id: 46,
+        name: "Eternal Sunshine of the Spotless Mind",
+        release_date: "2004-03-19"
+      },
+      {
+        id: 47,
+        name: "The Sixth Sense",
+        release_date: "1999-08-06"
+      },
+      {
+        id: 48,
+        name: "Memento",
+        release_date: "2000-09-05"
+      },
+      {
+        id: 49,
+        name: "American Beauty",
+        release_date: "1999-09-15"
+      },
+      {
+        id: 50,
+        name: "Good Will Hunting",
+        release_date: "1997-12-05"
+      }
+    ]
+  end
+
+  def fields
+    main_panel do
+      field :id, as: :id
+      field :name, as: :text
+      field :release_date, as: :date
+      field :fun_fact, only_on: :index, visible: -> { resource.record&.fun_fact.present? } do
+        record.fun_fact.truncate_words(10)
+      end
+
+      sidebar do
+        field :fun_fact do
+          record.fun_fact || "There is no register of a fun fact for #{record.name}"
+        end
+      end
+    end
+  end
+end
diff --git a/spec/dummy/app/avo/resources/person.rb b/spec/dummy/app/avo/resources/person.rb
index 2fe4638dd8..544c408c0f 100644
--- a/spec/dummy/app/avo/resources/person.rb
+++ b/spec/dummy/app/avo/resources/person.rb
@@ -24,5 +24,86 @@ def fields
       as: :has_many,
       hide_search_input: true,
       description: "Default behaviour with link_to_child_resource disabled"
+
+    tabs do
+      tab "Employment" do
+        panel do
+          field :job_title, as: :heading do
+            "Software Engineer"
+          end
+
+          row do
+            field :company, stacked: true do
+              "TechCorp Inc."
+            end
+            field :department, stacked: true do
+              "Research & Development"
+            end
+          end
+
+          field :years_of_experience do
+            "7 Years"
+          end
+
+          sidebar do
+            field :employee_id do
+              "EMP123456"
+            end
+            field :supervisor do
+              "Jane Smith"
+            end
+          end
+        end
+      end
+
+      tab "Address", lazy_load: true do
+        panel do
+          field :address, as: :heading
+          row do
+            field :street_address, stacked: true do
+              "1234 Elm Street"
+            end
+            field :city, stacked: true do
+              "Los Angeles"
+            end
+          end
+
+          field :state do
+            "California"
+          end
+
+          sidebar do
+            field :phone_number do
+              "+1 (555) 123-4567"
+            end
+            field :zip_code do
+              "90001"
+            end
+          end
+        end
+      end
+
+      tab "Preferences" do
+        panel do
+          field :preferred_language do
+            "English"
+          end
+
+          field :theme_mode do
+            "Dark Mode"
+          end
+
+          field :notification_preference do
+            "Email & SMS"
+          end
+
+          sidebar do
+            field :timezone do
+              "Pacific Time (PST)"
+            end
+          end
+        end
+      end
+    end
   end
 end
diff --git a/spec/dummy/app/avo/resources/product.rb b/spec/dummy/app/avo/resources/product.rb
index 92e60daeec..1913912ac1 100644
--- a/spec/dummy/app/avo/resources/product.rb
+++ b/spec/dummy/app/avo/resources/product.rb
@@ -58,5 +58,6 @@ def fields
     field :description, as: :tiptap, placeholder: "Enter text", always_show: false
     field :image, as: :file, is_image: true
     field :category, as: :select, enum: ::Product.categories
+    field :sizes, as: :select, multiple: true, options: {Large: :large, Medium: :medium, Small: :small}
   end
 end
diff --git a/spec/dummy/app/avo/resources/project.rb b/spec/dummy/app/avo/resources/project.rb
index 9d8d70f802..8e81a8a413 100644
--- a/spec/dummy/app/avo/resources/project.rb
+++ b/spec/dummy/app/avo/resources/project.rb
@@ -60,7 +60,7 @@ def fields
       relative: true,
       timezone: "EET",
       format: "MMMM dd, y HH:mm:ss z"
-    field :description, as: :markdown, height: "350px"
+    field :description, as: :easy_mde, height: "350px"
     field :files,
       as: :files,
       translation_key: "avo.field_translations.files",
diff --git a/spec/dummy/app/avo/resources/team.rb b/spec/dummy/app/avo/resources/team.rb
index 9299ec1a6a..840ab0fcf1 100644
--- a/spec/dummy/app/avo/resources/team.rb
+++ b/spec/dummy/app/avo/resources/team.rb
@@ -13,6 +13,10 @@ class Avo::Resources::Team < Avo::BaseResource
     end
   }
 
+  self.row_controls_config = {
+    show_on_hover: true
+  }
+
   def fields
     main_panel do
       field :preview, as: :preview
diff --git a/spec/dummy/app/avo/resources/user.rb b/spec/dummy/app/avo/resources/user.rb
index a475a9300b..fba98712be 100644
--- a/spec/dummy/app/avo/resources/user.rb
+++ b/spec/dummy/app/avo/resources/user.rb
@@ -45,6 +45,11 @@ class Avo::Resources::User < Avo::BaseResource
     end
   }
 
+  # self.row_controls_config = {
+  #   float: true,
+  #   show_on_hover: true
+  # }
+
   def fields
     test_field("Heading")
 
@@ -71,6 +76,7 @@ def actions
     divider label: "Other actions"
     action Avo::Actions::Sub::DummyAction
     action Avo::Actions::DownloadFile, icon: "heroicons/outline/arrow-left"
+    action Avo::Actions::Test::Query
     divider
     action Avo::Actions::Test::NoConfirmationPostsRedirect
     action Avo::Actions::Test::NoConfirmationRedirect
diff --git a/spec/dummy/app/controllers/avo/attendees_controller.rb b/spec/dummy/app/controllers/avo/attendees_controller.rb
new file mode 100644
index 0000000000..6c8b7ff23d
--- /dev/null
+++ b/spec/dummy/app/controllers/avo/attendees_controller.rb
@@ -0,0 +1,4 @@
+# This controller has been generated to enable Rails' resource routes.
+# More information on https://docs.avohq.io/3.0/controllers.html
+class Avo::AttendeesController < Avo::ArrayController
+end
diff --git a/spec/dummy/app/controllers/avo/field_discovery_users_controller.rb b/spec/dummy/app/controllers/avo/field_discovery_users_controller.rb
new file mode 100644
index 0000000000..4ef6e31b11
--- /dev/null
+++ b/spec/dummy/app/controllers/avo/field_discovery_users_controller.rb
@@ -0,0 +1,4 @@
+# This controller has been generated to enable Rails' resource routes.
+# More information on https://docs.avohq.io/3.0/controllers.html
+class Avo::FieldDiscoveryUsersController < Avo::ResourcesController
+end
diff --git a/spec/dummy/app/controllers/avo/movies_controller.rb b/spec/dummy/app/controllers/avo/movies_controller.rb
new file mode 100644
index 0000000000..4e485e3bed
--- /dev/null
+++ b/spec/dummy/app/controllers/avo/movies_controller.rb
@@ -0,0 +1,4 @@
+# This controller has been generated to enable Rails' resource routes.
+# More information on https://docs.avohq.io/3.0/controllers.html
+class Avo::MoviesController < Avo::ArrayController
+end
diff --git a/spec/dummy/app/models/course.rb b/spec/dummy/app/models/course.rb
index fb1a6bf687..92cc01f6d8 100644
--- a/spec/dummy/app/models/course.rb
+++ b/spec/dummy/app/models/course.rb
@@ -72,4 +72,11 @@ def self.ransackable_attributes(auth_object = nil)
   def self.ransackable_associations(auth_object = nil)
     ["links"]
   end
+
+  # Testing purposes on Avo::Resources::Course
+  # Tests that the field is populated from here
+  # field :attendees, as: :array
+  def attendees
+    User.all.first(6)
+  end
 end
diff --git a/spec/dummy/app/models/event.rb b/spec/dummy/app/models/event.rb
index 9b9ec60bd2..0841e5e929 100644
--- a/spec/dummy/app/models/event.rb
+++ b/spec/dummy/app/models/event.rb
@@ -21,4 +21,8 @@ class Event < ApplicationRecord
   def first_user
     User.first
   end
+
+  def attendees
+    raise "Test array resource, this method should not be called"
+  end
 end
diff --git a/spec/dummy/app/models/project.rb b/spec/dummy/app/models/project.rb
index 454fe3aa34..45e137be48 100644
--- a/spec/dummy/app/models/project.rb
+++ b/spec/dummy/app/models/project.rb
@@ -51,4 +51,9 @@ class Project < ApplicationRecord
   def self.ransackable_attributes(auth_object = nil)
     ["budget", "country", "created_at", "description", "id", "meta", "name", "progress", "stage", "started_at", "status", "updated_at", "users_required"]
   end
+
+  # Used to test tags on select mode with {value:,label:}
+  def dummy_field=(value)
+    TestBuddy.hi("dummy_field value is '#{value}'")
+  end
 end
diff --git a/spec/dummy/app/views/avo/resource_tools/_city_editor.html.erb b/spec/dummy/app/views/avo/resource_tools/_city_editor.html.erb
index 56064ab617..ca2ac9e9da 100644
--- a/spec/dummy/app/views/avo/resource_tools/_city_editor.html.erb
+++ b/spec/dummy/app/views/avo/resource_tools/_city_editor.html.erb
@@ -14,7 +14,7 @@
           <% if params[:show_native_fields].present? %>
             <%= avo_edit_field(:description, as: :trix, form: form, component_options: {resource_name: 'cities', resource_id: @resource.record&.id}) %>
           <% end %>
-          <%= avo_edit_field(:tiny_description, as: :markdown, form: form) %>
+          <%= avo_edit_field(:tiny_description, as: :easy_mde, form: form) %>
           <%= avo_edit_field(:status, as: :select, enum: ::City.statuses, form: form) %>
           <%= avo_show_field(:status, as: :badge, enum: ::City.statuses, form: form) %>
         <% end %>
diff --git a/spec/dummy/app/views/avo/resource_tools/_fish_information.html.erb b/spec/dummy/app/views/avo/resource_tools/_fish_information.html.erb
index 591cbc49c7..f75219d79b 100644
--- a/spec/dummy/app/views/avo/resource_tools/_fish_information.html.erb
+++ b/spec/dummy/app/views/avo/resource_tools/_fish_information.html.erb
@@ -8,10 +8,10 @@
     <% if form.present? %>
       <% c.with_body do %>
         <div class="divide-y">
-        <div class="flex">
-          <%= avo_edit_field :fish_type, as: :text, form: form, help: "Set the fish type", required: true, component_options: {compact: false, stacked: false} %>
-          <%= avo_edit_field :properties, as: :text, form: form, name: "Property 1", help: "Prop 1", required: true, component_options: {multiple: true} %>
-        </div>
+          <div class="flex">
+            <%= avo_edit_field :fish_type, as: :text, form: form, help: "Set the fish type", required: true, component_options: {compact: false, stacked: false} %>
+            <%= avo_edit_field :properties, as: :text, form: form, name: "Property 1", help: "Prop 1", required: true, component_options: {multiple: true} %>
+          </div>
           <%= avo_edit_field :properties, as: :text, form: form, name: "Property 2", help: "Prop 2", required: true, component_options: {multiple: true} %>
 
           <%= form.fields_for :information do |information_form| %>
diff --git a/spec/dummy/config/initializers/avo.rb b/spec/dummy/config/initializers/avo.rb
index 0823ef04bd..063fd18fba 100644
--- a/spec/dummy/config/initializers/avo.rb
+++ b/spec/dummy/config/initializers/avo.rb
@@ -40,7 +40,6 @@
   config.id_links_to_resource = true
   config.full_width_container = false
   config.buttons_on_form_footers = false
-  # config.resource_controls_placement = ENV["AVO_RESOURCE_CONTROLS_PLACEMENT"]&.to_sym || :right
   config.resource_default_view = :show
   config.search_debounce = 300
   # config.field_wrapper_layout = :stacked
@@ -101,6 +100,10 @@
   #     type: :countless
   #   }
   # end
+
+  config.column_names_mapping = {
+    custom_css: {field: "code"}
+  }
 end
 
 if defined?(Avo::DynamicFilters)
@@ -110,6 +113,13 @@
   end
 end
 
+if defined?(Avo::MediaLibrary)
+  Avo::MediaLibrary.configure do |config|
+    config.visible = -> { Avo::Current.user.is_developer? }
+    config.enabled = true
+  end
+end
+
 Rails.configuration.to_prepare do
   Avo::Fields::BaseField.include ActionView::Helpers::UrlHelper
   Avo::Fields::BaseField.include ActionView::Context
diff --git a/spec/dummy/config/locales/avo.en.yml b/spec/dummy/config/locales/avo.en.yml
index daba5030b8..45d166e75c 100644
--- a/spec/dummy/config/locales/avo.en.yml
+++ b/spec/dummy/config/locales/avo.en.yml
@@ -1,6 +1,8 @@
 ---
 en:
   avo:
+    media_library:
+      title: Media Library
     resource_translations:
       product:
         save: "Save the product!"
@@ -25,6 +27,7 @@ en:
     clear_value: Clear value
     click_to_reveal_filters: Click to reveal filters
     close_modal: Close modal
+    close: Close
     confirm: Confirm
     create_new_item: Create new %{item}
     dashboard: Dashboard
diff --git a/spec/dummy/db/schema.rb b/spec/dummy/db/schema.rb
index 4dfeba42ca..4a41fc805e 100644
--- a/spec/dummy/db/schema.rb
+++ b/spec/dummy/db/schema.rb
@@ -10,9 +10,9 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.0].define(version: 2024_11_14_165947) do
+ActiveRecord::Schema[8.0].define(version: 2025_01_03_192051) do
   # These are extensions that must be enabled in order to support this database
-  enable_extension "plpgsql"
+  enable_extension "pg_catalog.plpgsql"
 
   create_table "action_text_rich_texts", force: :cascade do |t|
     t.string "name", null: false
@@ -173,6 +173,7 @@
     t.datetime "updated_at", null: false
     t.integer "price_cents", default: 0, null: false
     t.string "price_currency", default: "'USD'::character varying", null: false
+    t.string "sizes", default: [], array: true
   end
 
   create_table "projects", force: :cascade do |t|
diff --git a/spec/features/avo/array_resource_spec.rb b/spec/features/avo/array_resource_spec.rb
new file mode 100644
index 0000000000..de128c9856
--- /dev/null
+++ b/spec/features/avo/array_resource_spec.rb
@@ -0,0 +1,39 @@
+require "rails_helper"
+
+RSpec.feature "ArrayResource", type: :feature do
+  describe "from index to show" do
+    it "render the movies index using the def records resource method and navigate to show" do
+      visit path = avo.resources_movies_path(per_page: 12)
+
+      expect(find("table thead").text).to eq "Select all\nId\nName\nRelease date\nFun fact"
+      expect(page).to have_text "The Shawshank Redemption"
+      expect(page).to have_text "The iconic cat in the opening scene was a stray..."
+
+      first("a[href=\"#{path}&page=2\"]").click
+      expect(find("table thead").text).to eq "Select all\nId\nName\nRelease date"
+
+      expect(page).to have_text "The Lord of the Rings: The Fellowship of the Ring"
+
+      first("a[href=\"#{path}&page=3\"]").click
+
+      first('a[href="/admin/resources/movies/28"]').click
+
+      within("div.resource-sidebar-component") do
+        fun_fact_text = find('div[data-field-id="fun_fact"] [data-slot="value"]').text
+        expect(fun_fact_text).to eq "Ryan Gosling learned to play the piano for his role, mastering several songs within three months."
+      end
+    end
+
+    it "render the attendees index using the def records resource method and navigate to show" do
+      visit avo.resources_attendees_path
+
+      expect(find("table thead").text).to eq "Select all\nId\nName"
+      expect(page).to have_text User.first.name
+
+      first("a[href=\"#{avo.resources_attendee_path User.first}\"]").click
+
+      name = find('div[data-field-id="name"] [data-slot="value"]').text
+      expect(name).to eq User.first.name
+    end
+  end
+end
diff --git a/spec/features/avo/model_missing_resource_spec.rb b/spec/features/avo/model_missing_resource_spec.rb
index aea85dfcb4..c7f818dbb1 100644
--- a/spec/features/avo/model_missing_resource_spec.rb
+++ b/spec/features/avo/model_missing_resource_spec.rb
@@ -4,7 +4,7 @@
   subject { visit url }
 
   context "when has_one field" do
-    let(:url) { "/admin/resources/stores/#{store.id}/location/#{location.id}?turbo_frame=has_one_field_show_location" }
+    let(:url) { "/admin/resources/stores/#{store.id}/location/#{location.id}?view=show&turbo_frame=has_one_field_show_location&show_location_field=1" }
     let!(:store) { create :store }
     let!(:location) { create :location, store: store }
 
@@ -28,7 +28,7 @@
 
   context "when has_many field" do
     let!(:team) { create :team }
-    let(:url) { "/admin/resources/teams/#{team.id}/locations?turbo_frame=has_many_field_show_locations" }
+    let(:url) { "/admin/resources/teams/#{team.id}/locations?turbo_frame=has_many_field_show_locations&show_location_field=1" }
 
     it "shows informative error with suggested solution for missing resource" do
       expect {
@@ -39,7 +39,7 @@
 
   context "when has_and_belongs_to_many field" do
     let!(:course) { create :course }
-    let(:url) { "/admin/resources/courses/#{course.id}/locations?turbo_frame=has_and_belongs_to_many_field_show_locations" }
+    let(:url) { "/admin/resources/courses/#{course.id}/locations?turbo_frame=has_and_belongs_to_many_field_show_locations&show_location_field=1" }
 
     it "shows informative error with suggested solution for missing resource" do
       expect {
diff --git a/spec/features/avo/radio_field_spec.rb b/spec/features/avo/radio_field_spec.rb
index 3a211f7cc8..eea6df7f31 100644
--- a/spec/features/avo/radio_field_spec.rb
+++ b/spec/features/avo/radio_field_spec.rb
@@ -62,4 +62,25 @@
       end
     end
   end
+
+  describe "on actions" do
+    it "display options" do
+      visit avo.resources_users_path
+
+      expect(page).not_to have_text("Small Option")
+      expect(page).not_to have_text("Medium Option")
+      expect(page).not_to have_text("Large Option")
+
+      open_panel_action(action_name: "Dummy action")
+
+      expect(page).to have_text("Small Option")
+      expect(page).to have_text("Medium Option")
+      expect(page).to have_checked_field("fields_size_medium")
+      expect(page).to have_text("Large Option")
+
+      find("label[for='fields_size_large']").click
+      expect(page).not_to have_checked_field("fields_size_medium")
+      expect(page).to have_checked_field("fields_size_large")
+    end
+  end
 end
diff --git a/spec/features/avo/resource_controls_placement_spec.rb b/spec/features/avo/resource_controls_placement_spec.rb
index bb9c9b53a4..7fe8f0474c 100644
--- a/spec/features/avo/resource_controls_placement_spec.rb
+++ b/spec/features/avo/resource_controls_placement_spec.rb
@@ -1,17 +1,17 @@
 require "rails_helper"
 
-RSpec.feature "ResourceControlsPlacement", type: :feature do
+RSpec.feature "ResourceControlsConfiguration", type: :feature do
   let!(:comment) { create :comment }
 
   around do |example|
-    original_placement = Avo.configuration.resource_controls_placement
+    original_placement = Avo.configuration.resource_row_controls_config
     example.run
-    Avo.configuration.resource_controls_placement = original_placement
+    Avo.configuration.resource_row_controls_config = original_placement
   end
 
   describe "with controls on the left" do
     it "shows to the left when configured from Avo.configuration" do
-      Avo.configuration.resource_controls_placement = :left
+      Avo.configuration.resource_row_controls_config = {placement: :left}
       visit "/admin/resources/comments"
 
       within find("table") do
@@ -21,7 +21,7 @@
     end
 
     it "shows to the left when configured from resource configuration" do
-      with_temporary_class_option(Avo::Resources::Comment, :controls_placement, :left) do
+      with_temporary_class_option(Avo::Resources::Comment, :row_controls_config, {placement: :left}) do
         visit "/admin/resources/comments"
 
         within find("table") do
@@ -34,7 +34,7 @@
 
   describe "with controls on the right" do
     it "shows to the right when configured from Avo.configuration" do
-      Avo.configuration.resource_controls_placement = :right
+      Avo.configuration.resource_row_controls_config = {placement: :right}
       visit "/admin/resources/comments"
 
       within find("table") do
@@ -44,7 +44,7 @@
     end
 
     it "shows to the right when configured from resource configuration" do
-      with_temporary_class_option(Avo::Resources::Comment, :controls_placement, :right) do
+      with_temporary_class_option(Avo::Resources::Comment, :row_controls_config, {placement: :right}) do
         visit "/admin/resources/comments"
 
         within find("table") do
@@ -57,7 +57,7 @@
 
   describe "with controls on both sides" do
     it "shows on both sides when configured from Avo.configuration" do
-      Avo.configuration.resource_controls_placement = :both
+      Avo.configuration.resource_row_controls_config = {placement: :both}
       visit "/admin/resources/comments"
 
       within find("table") do
@@ -68,7 +68,7 @@
     end
 
     it "shows on both sides when configured from resource configuration" do
-      with_temporary_class_option(Avo::Resources::Comment, :controls_placement, :both) do
+      with_temporary_class_option(Avo::Resources::Comment, :row_controls_config, {placement: :both}) do
         visit "/admin/resources/comments"
 
         within find("table") do
diff --git a/spec/features/avo/select_field_spec.rb b/spec/features/avo/select_field_spec.rb
index 62bac79102..ff85854ac7 100644
--- a/spec/features/avo/select_field_spec.rb
+++ b/spec/features/avo/select_field_spec.rb
@@ -229,4 +229,53 @@ def test_array
       end
     end
   end
+
+  describe "when options are multiple select" do
+    context "new" do
+      it "allow selection of multiple values" do
+        visit avo.new_resources_product_path
+
+        expect(page).to have_select "product_sizes", multiple: true, options: ["Large", "Medium", "Small"]
+
+        select "Large", from: "product_sizes"
+        select "Medium", from: "product_sizes"
+
+        save
+
+        expect(find_field_element(:sizes)).to have_text("Large, Medium")
+        expect(Product.last.sizes).to match_array(["large", "medium"])
+      end
+    end
+
+    context "edit" do
+      let(:product) { create :product, sizes: [:large] }
+
+      it "allow changing of selected values" do
+        visit avo.edit_resources_product_path(product)
+
+        expect(page).to have_select "product_sizes", selected: ["Large"], multiple: true, options: ["Large", "Medium", "Small"]
+
+        select "Medium", from: "product_sizes"
+        select "Small", from: "product_sizes"
+
+        save
+
+        expect(find_field_element(:sizes)).to have_text("Large, Medium, Small")
+        expect(Product.last.sizes).to match_array(["medium", "small", "large"])
+      end
+
+      it "allow deselecting of previously selected values" do
+        visit avo.edit_resources_product_path(product)
+
+        expect(page).to have_select "product_sizes", selected: ["Large"], multiple: true, options: ["Large", "Medium", "Small"]
+
+        page.unselect "Large", from: "Sizes"
+
+        save
+
+        expect(find_field_element(:sizes)).to have_text("—")
+        expect(Product.last.sizes).to match_array([])
+      end
+    end
+  end
 end
diff --git a/spec/system/avo/actions_spec.rb b/spec/system/avo/actions_spec.rb
index 384db2e34f..a095136a58 100644
--- a/spec/system/avo/actions_spec.rb
+++ b/spec/system/avo/actions_spec.rb
@@ -304,6 +304,56 @@
     end
   end
 
+  describe "query" do
+    let!(:users) { create_list :user, 6 }
+
+    it "access query action show" do
+      visit avo.resources_users_path(per_page: 3)
+
+      open_panel_action(action_name: "Test query access ")
+
+      expect(page).to have_text("message 0 selected")
+      expect(page).to have_field("fields_selected", with: "0 selected def fields")
+      expect(page).to have_text("cancel_button_label 0 selected")
+      expect(page).to have_text("confirm_button_label 0 selected")
+      expect(page).to have_text("Test query access 0")
+
+      run_action
+
+      expect(page).to have_text("succeed 0 selected")
+
+      check_select_all
+      open_panel_action(action_name: "Test query access ")
+
+      expect(page).to have_text("message 3 selected")
+      expect(page).to have_field("fields_selected", with: "3 selected def fields")
+      expect(page).to have_text("cancel_button_label 3 selected")
+      expect(page).to have_text("confirm_button_label 3 selected")
+      expect(page).to have_text("Test query access 3")
+
+      run_action
+
+      expect(page).to have_text("succeed 3 selected")
+
+      check_select_all
+      click_on "Select all matching"
+
+      open_panel_action(action_name: "Test query access ")
+
+      user_count = User.count
+
+      expect(page).to have_text("message #{user_count} selected")
+      expect(page).to have_field("fields_selected", with: "#{user_count} selected def fields")
+      expect(page).to have_text("cancel_button_label #{user_count} selected")
+      expect(page).to have_text("confirm_button_label #{user_count} selected")
+      expect(page).to have_text("Test query access #{user_count}")
+
+      run_action
+
+      expect(page).to have_text("succeed #{user_count} selected")
+    end
+  end
+
   describe "fields" do
     context "boolean group fields" do
       it "pass through fields params" do
@@ -358,6 +408,30 @@
     end
   end
 
+  describe "select items on grid view" do
+    let!(:post) { create :post }
+
+    it "enables and disables the actions" do
+      visit avo.resources_posts_path
+
+      # Find disabled action
+      click_on "Actions"
+      expect(page.find("a", text: "Toggle post published")["data-disabled"]).to eq "true"
+
+      # Hover grid element, select post, and verify that action is not disabled anymore
+      find("[data-component-name=\"avo/index/grid_item_component\"][data-resource-name=\"posts\"][data-record-id=\"#{post.id}\"]").hover
+      find('input[type="checkbox"][data-action="input->item-selector#toggle input->item-select-all#selectRow"]', visible: false).click
+      click_on "Actions"
+      expect(page.find("a", text: "Toggle post published")["data-disabled"]).to eq "false"
+
+      # Hover grid element, "unselect" post, and verify that action is disabled again
+      find("[data-component-name=\"avo/index/grid_item_component\"][data-resource-name=\"posts\"][data-record-id=\"#{post.id}\"]").hover
+      find('input[type="checkbox"][data-action="input->item-selector#toggle input->item-select-all#selectRow"]', visible: false).click
+      click_on "Actions"
+      expect(page.find("a", text: "Toggle post published")["data-disabled"]).to eq "true"
+    end
+  end
+
   #   let!(:roles) { { admin: false, manager: false, writer: false } }
   #   let!(:user) { create :user, active: true, roles: roles }
 
diff --git a/spec/system/avo/array_resource_spec.rb b/spec/system/avo/array_resource_spec.rb
new file mode 100644
index 0000000000..0b259a0b73
--- /dev/null
+++ b/spec/system/avo/array_resource_spec.rb
@@ -0,0 +1,54 @@
+require "rails_helper"
+
+RSpec.feature "ArrayResource", type: :system do
+  describe "from has_many association to show" do
+    let!(:event) { create :event }
+    let!(:course) { create :course }
+    let(:users) { create_list :user, 6 }
+
+    it "using the field block" do
+      visit avo.resources_event_path(event)
+
+      wait_for_loaded
+
+      expect(find("table thead").text).to eq "Select all\n\t\nID\n\t\nNAME\n\t\nROLE\n\t\nORGANIZATION"
+
+      expect(page).to have_text("Attendees from field")
+      expect(page).to have_text("John Doe")
+      expect(page).to have_text("Ethan Williams")
+
+      within("nav.pagy.nav") do
+        click_link("2")
+      end
+
+      expect(page).to have_text("Benjamin Green")
+      expect(page).to have_text("Sophia Martinez")
+
+      first('a[data-control="show"]').click
+      expect(page).to have_text("Sophia Martinez rendered as array resource")
+
+      expect(page).to have_text("Sophia Martinez")
+      expect(page).to have_text("Marketing Strategist")
+      expect(page).to have_text("Brandify")
+    end
+
+    it "using the record method" do
+      visit avo.resources_course_path(course)
+
+      scroll_to find('turbo-frame[id="array_field_show_attendees"]')
+
+      wait_for_turbo_frame_id("array_field_show_attendees")
+
+      expect(page).to have_text("First 6 users")
+
+      expect(find("table thead").text).to eq "Select all\n\t\nID\n\t\nNAME"
+
+      User.first(6).each do |user|
+        expect(page).to have_text(user.name)
+      end
+
+      all('a[data-control="show"]').last.click
+      expect(page).to have_text("#{User.first(6).last.name} rendered as array resource")
+    end
+  end
+end
diff --git a/spec/system/avo/date_time_fields/date_time_spec.rb b/spec/system/avo/date_time_fields/date_time_spec.rb
index 1dfa2df339..9fac3d0ad6 100644
--- a/spec/system/avo/date_time_fields/date_time_spec.rb
+++ b/spec/system/avo/date_time_fields/date_time_spec.rb
@@ -63,6 +63,7 @@
           close_picker
 
           save
+          wait_for_loaded
 
           expect(show_field_value(id: :started_at)).to eq "January 02, 2000 17:17:17 Europe/Bucharest"
         end
@@ -75,6 +76,7 @@
           click_button("reset")
 
           save
+          wait_for_loaded
 
           expect(show_field_value(id: :started_at)).to eq "—"
         end
@@ -117,6 +119,7 @@
           expect(text_input.value).to eq "1999-12-31 22:00:00"
 
           save
+          wait_for_loaded
 
           expect(show_field_value(id: :started_at)).to eq "December 31, 1999 22:00:00 America/Los_Angeles"
         end
@@ -137,6 +140,7 @@
           close_picker
 
           save
+          wait_for_loaded
 
           expect(show_field_value(id: :started_at)).to eq "January 02, 2000 17:17:17 America/Los_Angeles"
         end
@@ -177,6 +181,7 @@
           expect(text_input.value).to eq "2000-01-01 06:00:00"
 
           save
+          wait_for_loaded
 
           expect(show_field_value(id: :started_at)).to eq "January 01, 2000 06:00:00 UTC"
         end
@@ -196,6 +201,7 @@
 
           close_picker
           save
+          wait_for_loaded
 
           expect(show_field_value(id: :started_at)).to eq "January 02, 2000 17:17:17 UTC"
         end
@@ -236,6 +242,7 @@
           expect(text_input.value).to eq "2000-01-01 06:00:00"
 
           save
+          wait_for_loaded
 
           expect(show_field_value(id: :started_at)).to eq "January 01, 2000 06:00:00 UTC"
         end
@@ -255,6 +262,7 @@
 
           close_picker
           save
+          wait_for_loaded
 
           expect(show_field_value(id: :started_at)).to eq "January 02, 2000 17:17:17 UTC"
         end
diff --git a/spec/system/avo/date_time_fields/time_spec.rb b/spec/system/avo/date_time_fields/time_spec.rb
index 486468bf99..09990dd7b8 100644
--- a/spec/system/avo/date_time_fields/time_spec.rb
+++ b/spec/system/avo/date_time_fields/time_spec.rb
@@ -42,6 +42,7 @@
         expect(text_input.value).to eq "16:30"
 
         save
+        wait_for_loaded
 
         expect(find_field_value_element("starting_at").text).to eq "16:30"
       end
@@ -56,6 +57,7 @@
         close_picker
 
         save
+        wait_for_loaded
 
         expect(find_field_value_element("starting_at").text).to eq "17:30"
       end
@@ -67,6 +69,7 @@
 
         click_button("reset")
         save
+        wait_for_loaded
 
         expect(find_field_value_element("starting_at").text).to eq "—"
       end
@@ -105,6 +108,7 @@
         expect(text_input.value).to eq "16:30"
 
         save
+        wait_for_loaded
 
         expect(find_field_value_element("starting_at").text).to eq "16:30"
       end
@@ -226,6 +230,7 @@
         close_picker
 
         save
+        wait_for_loaded
 
         expect(find_field_value_element("starting_at").text).to eq "09:30"
       end
diff --git a/spec/system/avo/date_time_fields/timezone_spec.rb b/spec/system/avo/date_time_fields/timezone_spec.rb
index 40e84f6d51..53e0f774d6 100644
--- a/spec/system/avo/date_time_fields/timezone_spec.rb
+++ b/spec/system/avo/date_time_fields/timezone_spec.rb
@@ -43,6 +43,7 @@
           expect(text_input.value).to eq "2024-03-25 09:23:00"
 
           save
+          wait_for_loaded
 
           expect(show_field_value(id: :started_at)).to eq "March 25, 2024 09:23:00 CET"
         end
@@ -61,6 +62,7 @@
           close_picker
 
           save
+          wait_for_loaded
 
           expect(show_field_value(id: :started_at)).to eq "March 25, 2024 09:24:17 CET"
         end
@@ -101,6 +103,7 @@
           expect(text_input.value).to eq "2024-03-25 08:23:00"
 
           save
+          wait_for_loaded
 
           expect(show_field_value(id: :started_at)).to eq "March 25, 2024 08:23:00 UTC"
         end
@@ -119,6 +122,7 @@
           close_picker
 
           save
+          wait_for_loaded
 
           expect(show_field_value(id: :started_at)).to eq "March 25, 2024 08:24:17 UTC"
         end
diff --git a/spec/system/avo/has_field_discovery_spec.rb b/spec/system/avo/has_field_discovery_spec.rb
new file mode 100644
index 0000000000..e5ab6bca0a
--- /dev/null
+++ b/spec/system/avo/has_field_discovery_spec.rb
@@ -0,0 +1,298 @@
+require "rails_helper"
+
+RSpec.describe Avo::Concerns::HasFieldDiscovery, type: :system do
+  let!(:user) { create :user, first_name: "John", last_name: "Doe", birthday: "1990-01-01", email: "john.doe@example.com" }
+  let!(:post) { create :post, user: user, name: "Sample Post" }
+
+  before do
+    Avo::Resources::User.with_temporary_items do
+      main_panel do
+        discover_columns except: %i[email active is_admin? birthday is_writer outside_link custom_css]
+        discover_associations only: %i[cv_attachment]
+
+        sidebar do
+          with_options only_on: :show do
+            discover_columns only: %i[email], as: :gravatar, link_to_record: true, as_avatar: :circle
+            field :heading, as: :heading, label: ""
+            discover_columns only: %i[active], name: "Is active"
+          end
+
+          discover_columns only: %i[birthday]
+
+          field :password, as: :password, name: "User Password", required: false, only_on: :forms, help: 'You may verify the password strength <a href="http://www.passwordmeter.com/" target="_blank">here</a>.'
+          field :password_confirmation, as: :password, name: "Password confirmation", required: false, revealable: true
+
+          with_options only_on: :forms do
+            field :dev, as: :heading, label: '<div class="underline uppercase font-bold">DEV</div>', as_html: true
+            discover_columns only: %i[custom_css]
+          end
+        end
+      end
+
+      discover_associations only: %i[posts]
+      discover_associations except: %i[posts post cv_attachment]
+    end
+  end
+
+  after do
+    Avo::Resources::User.restore_items_from_backup
+  end
+
+  describe "Show Page" do
+    let(:url) { "/admin/resources/users/#{user.slug}" }
+
+    before { visit url }
+
+    it "displays discovered columns correctly" do
+      wait_for_loaded
+
+      # Verify discovered columns
+      expect(page).to have_text "FIRST NAME"
+      expect(page).to have_text "John"
+      expect(page).to have_text "LAST NAME"
+      expect(page).to have_text "Doe"
+      expect(page).to have_text "BIRTHDAY"
+      expect(page).to have_text "1990-01-01"
+
+      # Verify excluded fields are not displayed
+      expect(page).not_to have_text "IS ADMIN?"
+      expect(page).not_to have_text "CUSTOM CSS"
+    end
+
+    it "displays the email as a gravatar field with a link to the record" do
+      within(".resource-sidebar-component") do
+        expect(page).to have_css("img") # Check for avatar
+      end
+    end
+
+    it "displays discovered associations correctly" do
+      wait_for_loaded
+
+      expect(page).to have_selector("#has_many_field_show_posts")
+      expect(page).to have_selector("#has_many_field_show_posts")
+      expect(page).to have_selector("#has_many_field_show_people")
+      expect(page).to have_selector("#has_many_field_show_spouses")
+      expect(page).to have_selector("#has_many_field_show_comments")
+      expect(page).to have_selector("#has_and_belongs_to_many_field_show_projects")
+      expect(page).to have_selector("#has_many_field_show_team_memberships")
+      expect(page).to have_selector("#has_many_field_show_teams")
+
+      # Verify `cv_attachment` association is present
+      expect(page).to have_text "CV"
+    end
+
+    it "renders each field exactly once" do
+      wait_for_loaded
+
+      within(".main-content-area") do
+        within("[data-panel-id='main']") do
+          # Basic fields
+          ## Main Panel
+          expect(page).to have_text("FIRST NAME", count: 1)
+          expect(page).to have_text("LAST NAME", count: 1)
+          expect(page).to have_text("ROLES", count: 1)
+          expect(page).to have_text("TEAM ID", count: 1)
+          expect(page).to have_text("CREATED AT", count: 1)
+          expect(page).to have_text("UPDATED AT", count: 1)
+          expect(page).to have_text("SLUG", count: 1)
+
+          # Sidebar
+          expect(page).to have_text("AVATAR", count: 1)
+          expect(page).to have_text("IS ACTIVE", count: 1)
+          expect(page).to have_text("BIRTHDAY", count: 1)
+
+          # Single file uploads
+          expect(page).to have_text("CV", count: 1)
+          expect(page).not_to have_text("CV ATTACHMENT")
+        end
+
+        # Associations
+        expect(page).to have_selector("#has_many_field_show_posts", count: 1)
+      end
+    end
+  end
+
+  describe "Index Page" do
+    let(:url) { "/admin/resources/users" }
+
+    before { visit url }
+
+    it "lists discovered fields in the index view" do
+      wait_for_loaded
+
+      within("table") do
+        expect(page).to have_text "John"
+        expect(page).to have_text "Doe"
+        expect(page).to have_text user.slug
+      end
+    end
+  end
+
+  describe "Form Page" do
+    let(:url) { "/admin/resources/users/#{user.id}/edit" }
+
+    before { visit url }
+
+    it "displays form-specific fields" do
+      wait_for_loaded
+
+      # Verify form-only fields
+      expect(page).to have_field "User Password"
+      expect(page).to have_field "Password confirmation"
+
+      # Verify custom CSS field is displayed
+      expect(page).to have_text "CUSTOM CSS"
+
+      # Verify password fields allow input
+      fill_in "User Password", with: "new_password"
+      fill_in "Password confirmation", with: "new_password"
+    end
+
+    it "renders each input field exactly once" do
+      wait_for_loaded
+
+      # Form fields
+      expect(page).to have_text("FIRST NAME", count: 1)
+      expect(page).to have_text("LAST NAME", count: 1)
+      expect(page).to have_text("ROLES", count: 1)
+      expect(page).to have_text("TEAM ID", count: 1)
+      expect(page).to have_text("CREATED AT", count: 1)
+      expect(page).to have_text("UPDATED AT", count: 1)
+      expect(page).to have_text("SLUG", count: 1)
+
+      # File upload fields
+      expect(page).to have_text("CV", count: 1)
+
+      # Password fields
+      expect(page).to have_text("USER PASSWORD", count: 1)
+      expect(page).to have_text("PASSWORD CONFIRMATION", count: 1)
+    end
+  end
+
+  describe "Has One Attachment" do
+    let(:url) { "/admin/resources/users/#{user.id}/edit" }
+
+    before { visit url }
+
+    it "displays single file upload correctly for has_one_attached" do
+      wait_for_loaded
+
+      within('[data-field-id="cv"]') do
+        # Verify it shows "Choose File" instead of "Choose Files"
+        expect(page).to have_css('input[type="file"]:not([multiple])')
+      end
+    end
+  end
+
+  describe "Trix Editor" do
+    let(:event) { create :event }
+    let(:url) { "/admin/resources/events/#{event.id}/edit" }
+
+    after do
+      Avo::Resources::Event.restore_items_from_backup
+    end
+
+    before do
+      Avo::Resources::Event.with_temporary_items do
+        discover_columns
+      end
+      visit url
+    end
+
+    it "renders Trix editor only once" do
+      wait_for_loaded
+
+      # Verify only one Trix editor instance is present
+      expect(page).to have_css("trix-editor", count: 1)
+    end
+  end
+
+  describe "Tags" do
+    let(:post) { create :post }
+    let(:url) { "/admin/resources/posts/#{post.id}" }
+
+    after do
+      Avo::Resources::Post.restore_items_from_backup
+    end
+
+    before do
+      Avo::Resources::Post.with_temporary_items do
+        discover_columns
+      end
+      visit url
+    end
+
+    it "renders tags correctly" do
+      wait_for_loaded
+
+      # Verify only one Trix editor instance is present
+      expect(page).to have_text("TAGS", count: 1)
+      expect(page).to have_css('[data-target="tag-component"]')
+    end
+  end
+
+  describe "Enum Fields" do
+    let(:post) { create :post }
+    let(:url) { "/admin/resources/posts/#{post.id}/edit" }
+
+    after do
+      Avo::Resources::Post.restore_items_from_backup
+    end
+
+    before do
+      Avo::Resources::Post.with_temporary_items do
+        discover_columns
+      end
+      visit url
+    end
+
+    it "displays enum fields as select boxes" do
+      wait_for_loaded
+
+      within('[data-field-id="status"]') do
+        expect(page).to have_css("select")
+        expect(page).to have_select(options: ["draft", "published", "archived"])
+        expect(page).to have_select(selected: post.status)
+      end
+    end
+  end
+
+  describe "Polymorphic Associations" do
+    let(:post) { create :post }
+    let(:comment) { create :comment, commentable: post }
+
+    after do
+      Avo::Resources::Comment.restore_items_from_backup
+    end
+
+    before do
+      Avo::Resources::Comment.with_temporary_items do
+        discover_associations
+      end
+      visit "/admin/resources/comments/#{comment.id}"
+    end
+
+    it "displays polymorphic association correctly" do
+      wait_for_loaded
+
+      within("[data-panel-id='main']") do
+        expect(page).to have_text("COMMENTABLE")
+        expect(page).to have_link(post.name, href: /\/admin\/resources\/posts\//)
+      end
+    end
+  end
+
+  describe "Ignored Fields" do
+    before { visit "/admin/resources/users/#{user.slug}" }
+
+    it "does not display sensitive fields" do
+      wait_for_loaded
+
+      within("[data-panel-id='main']") do
+        expect(page).not_to have_text("ENCRYPTED_PASSWORD")
+        expect(page).not_to have_text("RESET_PASSWORD_TOKEN")
+        expect(page).not_to have_text("REMEMBER_CREATED_AT")
+      end
+    end
+  end
+end
diff --git a/spec/system/avo/location_field_spec.rb b/spec/system/avo/location_field_spec.rb
index 7ec9a3c4ab..50585a721b 100644
--- a/spec/system/avo/location_field_spec.rb
+++ b/spec/system/avo/location_field_spec.rb
@@ -59,7 +59,7 @@
 
     context "show" do
       it "renders a map" do
-        Avo::Fields::LocationField::ShowComponent.any_instance.stub(:js_map).and_return("map_content_here")
+        Avo::Fields::LocationField.any_instance.stub(:render_map).and_return("map_content_here")
         visit "/admin/resources/cities/#{city.id}"
 
         expect(page).to have_text("map_content_here")
diff --git a/spec/system/avo/tabs_spec.rb b/spec/system/avo/tabs_spec.rb
index a684e3f124..c155a704b7 100644
--- a/spec/system/avo/tabs_spec.rb
+++ b/spec/system/avo/tabs_spec.rb
@@ -230,4 +230,53 @@
 
     Avo.configuration.persistence = {driver: nil}
   end
+
+  let!(:person) { create :person }
+
+  it "lazy_load" do
+    visit avo.resources_person_path(person)
+
+    scroll_to first_tab_group
+
+    # Find visible information from first default tab
+    field_wrapper = find('div[data-field-id="company"]')
+    label = field_wrapper.find('div[data-slot="label"]')
+    value = field_wrapper.find('div[data-slot="value"]')
+    expect(label.text.strip).to eq("COMPANY")
+    expect(value.text.strip).to eq("TechCorp Inc.")
+
+    # Expect text from preferences and employment tabs (not lazy loaded) to be visible
+    within(:css, '.block.hidden[data-tabs-target="tabPanel"][data-tab-id="Preferences"]', visible: :all) do
+      # Find the field wrapper for "Notification preference"
+      field_wrapper = find('div[data-field-id="notification_preference"]', visible: :all)
+
+      # Locate the label and value within the wrapper
+      label = field_wrapper.find('div[data-slot="label"]', visible: :all)
+      value = field_wrapper.find('div[data-slot="value"]', visible: :all)
+
+      expect(label.text(:all).strip).to eq("Notification preference")
+      expect(value.text(:all).strip).to eq("Email & SMS")
+    end
+
+    # Expect not to find field from lazy loaded tab
+    within(:css, '.block.hidden[data-tabs-target="tabPanel"][data-tab-id="Address"]', visible: :all) do
+      expect(page).not_to have_selector('div[data-field-id="phone_number"]', visible: :all)
+    end
+
+    find('a[data-selected="false"][data-tabs-tab-name-param="Address"]').click
+    wait_for_loaded
+
+    # Find the phone number from lazy loaded tab after clicking on it
+    within(:css, '.block[data-tabs-target="tabPanel"][data-tab-id="Address"]', visible: :all) do
+      # Find the field wrapper for "Phone number"
+      field_wrapper = find('div[data-field-id="phone_number"]', visible: :all)
+
+      # Locate the label and value within the wrapper
+      label = field_wrapper.find('div[data-slot="label"]', visible: :all)
+      value = field_wrapper.find('div[data-slot="value"]', visible: :all)
+
+      expect(label.text(:all).strip).to eq("Phone number")
+      expect(value.text(:all).strip).to eq("+1 (555) 123-4567")
+    end
+  end
 end
diff --git a/spec/system/avo/tags_spec.rb b/spec/system/avo/tags_spec.rb
index d932d1ab78..76a320eed1 100644
--- a/spec/system/avo/tags_spec.rb
+++ b/spec/system/avo/tags_spec.rb
@@ -241,24 +241,76 @@
     it "on index" do
       Avo::Resources::Project.with_temporary_items do
         field :stage, as: :tags, mode: :select
+        field :dummy_field, as: :tags,
+          mode: :select,
+          close_on_select: true,
+          format_using: -> { [{value: "a_c2", label: "activity_category2"}] },
+          suggestions: [
+            {value: "a_c1", label: "activity_category1"},
+            {value: "a_c2", label: "activity_category2"},
+            {value: "a_c3", label: "activity_category3"}
+          ]
       end
 
       visit avo.resources_projects_path
 
+      expect(page).to have_text("activity_category2")
+      expect(page).not_to have_text("a_c2")
+
       projects.each do |project|
         expect(page).to have_text(project.stage)
       end
+
+      Avo::Resources::Project.restore_items_from_backup
     end
 
     it "on show" do
+      Avo::Resources::Project.with_temporary_items do
+        field :stage, as: :tags, mode: :select
+        field :dummy_field, as: :tags,
+          mode: :select,
+          close_on_select: true,
+          format_using: -> { [{value: "a_c2", label: "activity_category2"}] },
+          suggestions: [
+            {value: "a_c1", label: "activity_category1"},
+            {value: "a_c2", label: "activity_category2"},
+            {value: "a_c3", label: "activity_category3"}
+          ]
+      end
+
       visit avo.resources_project_path(projects.first)
 
+      expect(page).to have_text("activity_category2")
+      expect(page).not_to have_text("a_c2")
+
       expect(page).to have_text(projects.first.stage)
+
+      Avo::Resources::Project.restore_items_from_backup
     end
 
     it "on edit / update" do
+      expect(TestBuddy).to receive(:hi).with("dummy_field value is 'a_c2'").at_least :once
+
+      Avo::Resources::Project.with_temporary_items do
+        field :stage, as: :tags, mode: :select
+        field :dummy_field, as: :tags,
+          mode: :select,
+          close_on_select: true,
+          format_using: -> { [{value: "a_c2", label: "activity_category2"}] },
+          suggestions: [
+            {value: "a_c1", label: "activity_category1"},
+            {value: "a_c2", label: "activity_category2"},
+            {value: "a_c3", label: "activity_category3"}
+          ]
+      end
+
       visit avo.edit_resources_project_path(projects.first)
 
+      sleep 1
+
+      expect(page).not_to have_text("a_c2")
+      expect(page).to have_text("activity_category2")
+
       expect(page).to have_text(projects.first.stage)
 
       click_on "Save"
diff --git a/tailwind.preset.js b/tailwind.preset.js
index 71e617ad09..419c35a2f2 100644
--- a/tailwind.preset.js
+++ b/tailwind.preset.js
@@ -32,6 +32,7 @@ module.exports = {
         'cover-sm': '9/2',
         'cover-md': '9/3',
         'cover-lg': '9/4',
+        'media-library-item': '4/3',
       },
       colors: {
         blue,
@@ -132,7 +133,7 @@ module.exports = {
     },
   },
   variants: {
-    margin: ['responsive', 'hover', 'focus', 'group-hover', 'checked', 'kanban-dragging'],
+    margin: ['responsive', 'hover', 'focus', 'group-hover', 'checked', 'empty', 'kanban-dragging'],
     display: ['responsive', 'hover', 'focus', 'group-hover', 'checked', 'kanban-dragging'],
     padding: ['responsive', 'group-hover', 'kanban-dragging'],
     borderColor: ['responsive', 'hover', 'focus', 'disabled'],
@@ -145,6 +146,7 @@ module.exports = {
   plugins: [
     require('@tailwindcss/forms'),
     require('@tailwindcss/typography'),
+    require('@tailwindcss/container-queries'),
     plugin(({ addUtilities, addVariant }) => {
       const newUtilities = {
         '.backface-hidden': {
@@ -162,6 +164,7 @@ module.exports = {
       addVariant('index-grid-view', '.index-grid-view & ')
       addVariant('index-table-view', '.index-table-view & ')
       addVariant('kanban-dragging', '.kanban-dragging & ')
+      addVariant('floating-controls', '.floating-controls & ')
       addVariant('shift-pressed', '.shift-pressed & ')
     }),
   ],
diff --git a/yarn.lock b/yarn.lock
index 76ca2c8fbf..fd1c09877b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7,48 +7,48 @@
   resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf"
   integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==
 
-"@algolia/autocomplete-core@1.17.9":
-  version "1.17.9"
-  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-core/-/autocomplete-core-1.17.9.tgz#83374c47dc72482aa45d6b953e89377047f0dcdc"
-  integrity sha512-O7BxrpLDPJWWHv/DLA9DRFWs+iY1uOJZkqUwjS5HSZAGcl0hIVCQ97LTLewiZmZ402JYUrun+8NqFP+hCknlbQ==
+"@algolia/autocomplete-core@1.18.1":
+  version "1.18.1"
+  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-core/-/autocomplete-core-1.18.1.tgz#7abafd393126c0c5491ced8498a493173b238abf"
+  integrity sha512-+lOAwRkvxTt24AXNu3pT0EfCEh1ZOQkKlrgFa0Ji2jxSbY2WW3gb1k39JBPyXcCLlivdxYPXREdg8ImAF2Nw9Q==
   dependencies:
-    "@algolia/autocomplete-plugin-algolia-insights" "1.17.9"
-    "@algolia/autocomplete-shared" "1.17.9"
+    "@algolia/autocomplete-plugin-algolia-insights" "1.18.1"
+    "@algolia/autocomplete-shared" "1.18.1"
 
 "@algolia/autocomplete-js@^1.0.0-alpha.46":
-  version "1.17.9"
-  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-js/-/autocomplete-js-1.17.9.tgz#2f7e5599fdfe7d6c44b82ac5b64662b487615465"
-  integrity sha512-51xmsIfApj8LEceArnLe3UfS8HSgJJa70FUEYpnLryO6+KZL0pDPQHw1uVw6e5yJiKN0KelDmk2Sa2uJ+gVKJw==
+  version "1.18.1"
+  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-js/-/autocomplete-js-1.18.1.tgz#a74ca124a433864e154d05e2c2db89b4564dbabe"
+  integrity sha512-uPR+QnN7JU1nbf+m0lrLzSv/ptua72d8EcgWbKN1aacPR9xmdzmuVZoVuHW/Fypgg7ccm7/TlEX98DWnXjffpw==
   dependencies:
-    "@algolia/autocomplete-core" "1.17.9"
-    "@algolia/autocomplete-preset-algolia" "1.17.9"
-    "@algolia/autocomplete-shared" "1.17.9"
+    "@algolia/autocomplete-core" "1.18.1"
+    "@algolia/autocomplete-preset-algolia" "1.18.1"
+    "@algolia/autocomplete-shared" "1.18.1"
     htm "^3.1.1"
     preact "^10.13.2"
 
-"@algolia/autocomplete-plugin-algolia-insights@1.17.9":
-  version "1.17.9"
-  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-plugin-algolia-insights/-/autocomplete-plugin-algolia-insights-1.17.9.tgz#74c86024d09d09e8bfa3dd90b844b77d9f9947b6"
-  integrity sha512-u1fEHkCbWF92DBeB/KHeMacsjsoI0wFhjZtlCq2ddZbAehshbZST6Hs0Avkc0s+4UyBGbMDnSuXHLuvRWK5iDQ==
+"@algolia/autocomplete-plugin-algolia-insights@1.18.1":
+  version "1.18.1"
+  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-plugin-algolia-insights/-/autocomplete-plugin-algolia-insights-1.18.1.tgz#3227745d317f1fcf09e75df30606aff8bd275963"
+  integrity sha512-zrl5trCnSHXkBRZwo2VPw4fN5zT3DowgFR6O2Qh0gTni8HB+aQltJYVwBrFeTvZHHFKNY9Cua4Y1KNsYiJ9Rdw==
   dependencies:
-    "@algolia/autocomplete-shared" "1.17.9"
+    "@algolia/autocomplete-shared" "1.18.1"
 
-"@algolia/autocomplete-preset-algolia@1.17.9":
-  version "1.17.9"
-  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-preset-algolia/-/autocomplete-preset-algolia-1.17.9.tgz#911f3250544eb8ea4096fcfb268f156b085321b5"
-  integrity sha512-Na1OuceSJeg8j7ZWn5ssMu/Ax3amtOwk76u4h5J4eK2Nx2KB5qt0Z4cOapCsxot9VcEN11ADV5aUSlQF4RhGjQ==
+"@algolia/autocomplete-preset-algolia@1.18.1":
+  version "1.18.1"
+  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-preset-algolia/-/autocomplete-preset-algolia-1.18.1.tgz#36fcbf6cbcf7e353613339a4fe015193417ef7be"
+  integrity sha512-ifZV6vfVE9IKNdIe2+JhaBfY78LtnWnYrOFaSxJ7F45ixumSsRw7jCDoHwRxemoceHZzDpaSykSJwcy3XkTswA==
   dependencies:
-    "@algolia/autocomplete-shared" "1.17.9"
+    "@algolia/autocomplete-shared" "1.18.1"
 
-"@algolia/autocomplete-shared@1.17.9":
-  version "1.17.9"
-  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-shared/-/autocomplete-shared-1.17.9.tgz#5f38868f7cb1d54b014b17a10fc4f7e79d427fa8"
-  integrity sha512-iDf05JDQ7I0b7JEA/9IektxN/80a2MZ1ToohfmNS3rfeuQnIKI3IJlIafD0xu4StbtQTghx9T3Maa97ytkXenQ==
+"@algolia/autocomplete-shared@1.18.1":
+  version "1.18.1"
+  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-shared/-/autocomplete-shared-1.18.1.tgz#18175fd76fa01b692bc44b8e6dc63bf68623d031"
+  integrity sha512-vMKFYX5+SX+kIaJSMXOtj6zcMBhAWNyQJkfMrsuK38iJRTwemR23nzUE8qd3rHfWh6Iqgj89vDkf/CuOXDYllA==
 
 "@algolia/autocomplete-theme-classic@^1.0.0-alpha.46":
-  version "1.17.9"
-  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-theme-classic/-/autocomplete-theme-classic-1.17.9.tgz#df73d5f6a3c4674d46df9add3bb751bfb1bcf144"
-  integrity sha512-nCv0uv5J5r9riF1rJLfUY3AAJ11IbFifNocYINWG4cyOctHGoiK5ZDyYdQOLA98TCVR7hUywIYpvVCJBZnjGaw==
+  version "1.18.1"
+  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-theme-classic/-/autocomplete-theme-classic-1.18.1.tgz#530f2c79b06f14cb6a3d409dfc1f24d369470f6c"
+  integrity sha512-ZsHFwU0bj5jG2xDIFbl1PZM6B5NruIVkU7FPumcrhFicQXRUcXyJyNWrqBTCrUBXdtSNYu2eCTUi59aTZJvNPg==
 
 "@alloc/quick-lru@^5.2.0":
   version "5.2.0"
@@ -71,7 +71,7 @@
     "@babel/highlight" "^7.22.13"
     chalk "^2.4.2"
 
-"@babel/code-frame@^7.25.9", "@babel/code-frame@^7.26.0":
+"@babel/code-frame@^7.25.9", "@babel/code-frame@^7.26.2":
   version "7.26.2"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.26.2.tgz#4b5fab97d33338eff916235055f0ebc21e573a85"
   integrity sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==
@@ -85,42 +85,53 @@
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.5.tgz#ffb878728bb6bdcb6f4510aa51b1be9afb8cfd98"
   integrity sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==
 
-"@babel/compat-data@^7.25.9", "@babel/compat-data@^7.26.0":
+"@babel/compat-data@^7.25.9":
   version "7.26.2"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.26.2.tgz#278b6b13664557de95b8f35b90d96785850bb56e"
   integrity sha512-Z0WgzSEa+aUcdiJuCIqgujCshpMWgUpgOxXotrYPSA53hA3qopNaqcJpyr0hVb1FeWdnqFA35/fUtXgBK8srQg==
 
-"@babel/core@^7.26.0":
-  version "7.26.0"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.26.0.tgz#d78b6023cc8f3114ccf049eb219613f74a747b40"
-  integrity sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==
+"@babel/compat-data@^7.26.5":
+  version "7.26.5"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.26.5.tgz#df93ac37f4417854130e21d72c66ff3d4b897fc7"
+  integrity sha512-XvcZi1KWf88RVbF9wn8MN6tYFloU5qX8KjuF3E1PVBmJ9eypXfs4GRiJwLuTZL0iSnJUKn1BFPa5BPZZJyFzPg==
+
+"@babel/compat-data@^7.26.8":
+  version "7.26.8"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.26.8.tgz#821c1d35641c355284d4a870b8a4a7b0c141e367"
+  integrity sha512-oH5UPLMWR3L2wEFLnFJ1TZXqHufiTKAiLfqw5zkhS4dKXLJ10yVztfil/twG8EDTA4F/tvVNw9nOl4ZMslB8rQ==
+
+"@babel/core@^7.26.8":
+  version "7.26.8"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.26.8.tgz#7742f11c75acea6b08a8e24c5c0c8c89e89bf53e"
+  integrity sha512-l+lkXCHS6tQEc5oUpK28xBOZ6+HwaH7YwoYQbLFiYb4nS2/l1tKnZEtEWkD0GuiYdvArf9qBS0XlQGXzPMsNqQ==
   dependencies:
     "@ampproject/remapping" "^2.2.0"
-    "@babel/code-frame" "^7.26.0"
-    "@babel/generator" "^7.26.0"
-    "@babel/helper-compilation-targets" "^7.25.9"
+    "@babel/code-frame" "^7.26.2"
+    "@babel/generator" "^7.26.8"
+    "@babel/helper-compilation-targets" "^7.26.5"
     "@babel/helper-module-transforms" "^7.26.0"
-    "@babel/helpers" "^7.26.0"
-    "@babel/parser" "^7.26.0"
-    "@babel/template" "^7.25.9"
-    "@babel/traverse" "^7.25.9"
-    "@babel/types" "^7.26.0"
+    "@babel/helpers" "^7.26.7"
+    "@babel/parser" "^7.26.8"
+    "@babel/template" "^7.26.8"
+    "@babel/traverse" "^7.26.8"
+    "@babel/types" "^7.26.8"
+    "@types/gensync" "^1.0.0"
     convert-source-map "^2.0.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
     json5 "^2.2.3"
     semver "^6.3.1"
 
-"@babel/eslint-parser@^7.26.5":
-  version "7.26.5"
-  resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.26.5.tgz#aa669f4d873f9cd617050cf3c40c19cd96307efb"
-  integrity sha512-Kkm8C8uxI842AwQADxl0GbcG1rupELYLShazYEZO/2DYjhyWXJIOUVOE3tBYm6JXzUCNJOZEzqc4rCW/jsEQYQ==
+"@babel/eslint-parser@^7.26.8":
+  version "7.26.8"
+  resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.26.8.tgz#55c4f4aae4970ae127f7a12369182ed6250e6f09"
+  integrity sha512-3tBctaHRW6xSub26z7n8uyOTwwUsCdvIug/oxBH9n6yCO5hMj2vwDJAo7RbBMKrM7P+W2j61zLKviJQFGOYKMg==
   dependencies:
     "@nicolo-ribaudo/eslint-scope-5-internals" "5.1.1-v1"
     eslint-visitor-keys "^2.1.0"
     semver "^6.3.1"
 
-"@babel/generator@^7.25.9", "@babel/generator@^7.26.0":
+"@babel/generator@^7.25.9":
   version "7.26.2"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.26.2.tgz#87b75813bec87916210e5e01939a4c823d6bb74f"
   integrity sha512-zevQbhbau95nkoxSq3f/DC/SC+EEOUZd3DYqfSkMhY2/wfSeaHV1Ew4vk8e+x8lja31IbyuUa2uQ3JONqKbysw==
@@ -131,6 +142,17 @@
     "@jridgewell/trace-mapping" "^0.3.25"
     jsesc "^3.0.2"
 
+"@babel/generator@^7.26.8":
+  version "7.26.8"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.26.8.tgz#f9c5e770309e12e3099ad8271e52f6caa15442ab"
+  integrity sha512-ef383X5++iZHWAXX0SXQR6ZyQhw/0KtTkrTz61WXRhFM6dhpHulO/RJz79L8S6ugZHJkOOkUrUdxgdF2YiPFnA==
+  dependencies:
+    "@babel/parser" "^7.26.8"
+    "@babel/types" "^7.26.8"
+    "@jridgewell/gen-mapping" "^0.3.5"
+    "@jridgewell/trace-mapping" "^0.3.25"
+    jsesc "^3.0.2"
+
 "@babel/helper-annotate-as-pure@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz#e7f06737b197d580a01edf75d97e2c8be99d3882"
@@ -145,14 +167,6 @@
   dependencies:
     "@babel/types" "^7.25.9"
 
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.25.9.tgz#f41752fe772a578e67286e6779a68a5a92de1ee9"
-  integrity sha512-C47lC7LIDCnz0h4vai/tpNOI95tCd5ZT3iBt/DBH5lXKHZsyNQv18yf1wIIg2ntiQNgmAvA+DgZ82iW8Qdym8g==
-  dependencies:
-    "@babel/traverse" "^7.25.9"
-    "@babel/types" "^7.25.9"
-
 "@babel/helper-compilation-targets@^7.22.6":
   version "7.22.15"
   resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz#0698fc44551a26cf29f18d4662d5bf545a6cfc52"
@@ -175,6 +189,17 @@
     lru-cache "^5.1.1"
     semver "^6.3.1"
 
+"@babel/helper-compilation-targets@^7.26.5":
+  version "7.26.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.26.5.tgz#75d92bb8d8d51301c0d49e52a65c9a7fe94514d8"
+  integrity sha512-IXuyn5EkouFJscIDuFF5EsiSolseme1s0CZB+QxVugqJLYmKdxI1VfIBOst0SUu4rnk2Z7kqTwmoO1lp3HIfnA==
+  dependencies:
+    "@babel/compat-data" "^7.26.5"
+    "@babel/helper-validator-option" "^7.25.9"
+    browserslist "^4.24.0"
+    lru-cache "^5.1.1"
+    semver "^6.3.1"
+
 "@babel/helper-create-class-features-plugin@^7.18.6":
   version "7.22.15"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.15.tgz#97a61b385e57fe458496fad19f8e63b63c867de4"
@@ -232,10 +257,10 @@
     lodash.debounce "^4.0.8"
     resolve "^1.14.2"
 
-"@babel/helper-define-polyfill-provider@^0.6.2":
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.2.tgz#18594f789c3594acb24cfdb4a7f7b7d2e8bd912d"
-  integrity sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ==
+"@babel/helper-define-polyfill-provider@^0.6.3":
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.3.tgz#f4f2792fae2ef382074bc2d713522cf24e6ddb21"
+  integrity sha512-HK7Bi+Hj6H+VTHA3ZvBis7V/6hu9QuTrnMXNybfUf2iiuU/N97I8VjB+KbhFF8Rld/Lx5MzoCwPCpPjfK+n8Cg==
   dependencies:
     "@babel/helper-compilation-targets" "^7.22.6"
     "@babel/helper-plugin-utils" "^7.22.5"
@@ -312,6 +337,11 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.9.tgz#9cbdd63a9443a2c92a725cca7ebca12cc8dd9f46"
   integrity sha512-kSMlyUVdWe25rEsRGviIgOWnoT/nfABVWlqt9N19/dIPWViAOW2s9wznP5tURbs/IDuNk4gPy3YdYRgH3uxhBw==
 
+"@babel/helper-plugin-utils@^7.26.5":
+  version "7.26.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.26.5.tgz#18580d00c9934117ad719392c4f6585c9333cc35"
+  integrity sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==
+
 "@babel/helper-remap-async-to-generator@^7.25.9":
   version "7.25.9"
   resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.9.tgz#e53956ab3d5b9fb88be04b3e2f31b523afd34b92"
@@ -339,14 +369,6 @@
     "@babel/helper-optimise-call-expression" "^7.25.9"
     "@babel/traverse" "^7.25.9"
 
-"@babel/helper-simple-access@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.25.9.tgz#6d51783299884a2c74618d6ef0f86820ec2e7739"
-  integrity sha512-c6WHXuiaRsJTyHYLJV75t9IqsmTbItYfdj99PnzYGQZkYKvan5/2jKJ7gu31J3/BJ/A18grImSPModuyG/Eo0Q==
-  dependencies:
-    "@babel/traverse" "^7.25.9"
-    "@babel/types" "^7.25.9"
-
 "@babel/helper-skip-transparent-expression-wrappers@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz#007f15240b5751c537c40e77abb4e89eeaaa8847"
@@ -413,13 +435,13 @@
     "@babel/traverse" "^7.25.9"
     "@babel/types" "^7.25.9"
 
-"@babel/helpers@^7.26.0":
-  version "7.26.0"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.26.0.tgz#30e621f1eba5aa45fe6f4868d2e9154d884119a4"
-  integrity sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==
+"@babel/helpers@^7.26.7":
+  version "7.26.7"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.26.7.tgz#fd1d2a7c431b6e39290277aacfd8367857c576a4"
+  integrity sha512-8NHiL98vsi0mbPQmYAGWwfcFaOy4j2HY49fXJCfuDcdE7fMIsH9a7GdaeXpIBsbT7307WU8KCMp5pUVDNL4f9A==
   dependencies:
     "@babel/template" "^7.25.9"
-    "@babel/types" "^7.26.0"
+    "@babel/types" "^7.26.7"
 
 "@babel/highlight@^7.22.13":
   version "7.22.20"
@@ -435,13 +457,20 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.0.tgz#da950e622420bf96ca0d0f2909cdddac3acd8719"
   integrity sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==
 
-"@babel/parser@^7.25.9", "@babel/parser@^7.26.0", "@babel/parser@^7.26.2":
+"@babel/parser@^7.25.9", "@babel/parser@^7.26.2":
   version "7.26.2"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.2.tgz#fd7b6f487cfea09889557ef5d4eeb9ff9a5abd11"
   integrity sha512-DWMCZH9WA4Maitz2q21SRKHo9QXZxkDsbNZoVD62gusNtNBBqDg9i7uOhASfTfIGNzW+O+r7+jAlM8dwphcJKQ==
   dependencies:
     "@babel/types" "^7.26.0"
 
+"@babel/parser@^7.26.8":
+  version "7.26.8"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.8.tgz#deca2b4d99e5e1b1553843b99823f118da6107c2"
+  integrity sha512-TZIQ25pkSoaKEYYaHbbxkfL36GNsQ6iFiBbeuzAkLnXayKR1yP1zFe+NxuZWWsUyvt8icPU9CCq0sgWGXR1GEw==
+  dependencies:
+    "@babel/types" "^7.26.8"
+
 "@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.25.9":
   version "7.25.9"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.9.tgz#cc2e53ebf0a0340777fff5ed521943e253b4d8fe"
@@ -523,14 +552,14 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-async-generator-functions@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.9.tgz#1b18530b077d18a407c494eb3d1d72da505283a2"
-  integrity sha512-RXV6QAzTBbhDMO9fWwOmwwTuYaiPbggWQ9INdZqAYeSHyG7FzQ+nOZaUUjNwKv9pV3aE4WFqFm1Hnbci5tBCAw==
+"@babel/plugin-transform-async-generator-functions@^7.26.8":
+  version "7.26.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.26.8.tgz#5e3991135e3b9c6eaaf5eff56d1ae5a11df45ff8"
+  integrity sha512-He9Ej2X7tNf2zdKMAGOsmg2MrFc+hfoAhd3po4cWfo/NWjzEAKa0oQruj1ROVUdl0e6fb6/kE/G3SSxE0lRJOg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.26.5"
     "@babel/helper-remap-async-to-generator" "^7.25.9"
-    "@babel/traverse" "^7.25.9"
+    "@babel/traverse" "^7.26.8"
 
 "@babel/plugin-transform-async-to-generator@^7.25.9":
   version "7.25.9"
@@ -541,12 +570,12 @@
     "@babel/helper-plugin-utils" "^7.25.9"
     "@babel/helper-remap-async-to-generator" "^7.25.9"
 
-"@babel/plugin-transform-block-scoped-functions@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.25.9.tgz#5700691dbd7abb93de300ca7be94203764fce458"
-  integrity sha512-toHc9fzab0ZfenFpsyYinOX0J/5dgJVA2fm64xPewu7CoYHWEivIWKxkK2rMi4r3yQqLnVmheMXRdG+k239CgA==
+"@babel/plugin-transform-block-scoped-functions@^7.26.5":
+  version "7.26.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.26.5.tgz#3dc4405d31ad1cbe45293aa57205a6e3b009d53e"
+  integrity sha512-chuTSY+hq09+/f5lMj8ZSYgCFpppV2CbYrhNFJ1BFoXpiWPnnAb7R0MqrafCpN8E1+YRrtM1MXZHJdIx8B6rMQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.26.5"
 
 "@babel/plugin-transform-block-scoping@^7.25.9":
   version "7.25.9"
@@ -628,12 +657,11 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-exponentiation-operator@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.25.9.tgz#ece47b70d236c1d99c263a1e22b62dc20a4c8b0f"
-  integrity sha512-KRhdhlVk2nObA5AYa7QMgTMTVJdfHprfpAk4DjZVtllqRg9qarilstTKEhpVjyt+Npi8ThRyiV8176Am3CodPA==
+"@babel/plugin-transform-exponentiation-operator@^7.26.3":
+  version "7.26.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.26.3.tgz#e29f01b6de302c7c2c794277a48f04a9ca7f03bc"
+  integrity sha512-7CAHcQ58z2chuXPWblnn1K6rLDnDWieghSOEmqQsrBenH0P9InCUtOJYD89pvngljmZlJcz3fcmgYsXFNGa1ZQ==
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.25.9"
     "@babel/helper-plugin-utils" "^7.25.9"
 
 "@babel/plugin-transform-export-namespace-from@^7.25.9":
@@ -696,14 +724,13 @@
     "@babel/helper-module-transforms" "^7.25.9"
     "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-modules-commonjs@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.25.9.tgz#d165c8c569a080baf5467bda88df6425fc060686"
-  integrity sha512-dwh2Ol1jWwL2MgkCzUSOvfmKElqQcuswAZypBSUsScMXvgdT8Ekq5YA6TtqpTVWH+4903NmboMuH1o9i8Rxlyg==
+"@babel/plugin-transform-modules-commonjs@^7.26.3":
+  version "7.26.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.26.3.tgz#8f011d44b20d02c3de44d8850d971d8497f981fb"
+  integrity sha512-MgR55l4q9KddUDITEzEFYn5ZsGDXMSsU9E+kh7fjRXTIC3RHqfCo8RPRbyReYJh44HQ/yomFkqbOFohXvDCiIQ==
   dependencies:
-    "@babel/helper-module-transforms" "^7.25.9"
+    "@babel/helper-module-transforms" "^7.26.0"
     "@babel/helper-plugin-utils" "^7.25.9"
-    "@babel/helper-simple-access" "^7.25.9"
 
 "@babel/plugin-transform-modules-systemjs@^7.25.9":
   version "7.25.9"
@@ -738,12 +765,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-nullish-coalescing-operator@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.25.9.tgz#bcb1b0d9e948168102d5f7104375ca21c3266949"
-  integrity sha512-ENfftpLZw5EItALAD4WsY/KUWvhUlZndm5GC7G3evUsVeSJB6p0pBeLQUnRnBCBx7zV0RKQjR9kCuwrsIrjWog==
+"@babel/plugin-transform-nullish-coalescing-operator@^7.26.6":
+  version "7.26.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.26.6.tgz#fbf6b3c92cb509e7b319ee46e3da89c5bedd31fe"
+  integrity sha512-CKW8Vu+uUZneQCPtXmSBUC6NCAUdya26hWCElAWh5mVSlSRsmiCPUUDKb3Z0szng1hiAJa098Hkhg9o4SE35Qw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.26.5"
 
 "@babel/plugin-transform-numeric-separator@^7.25.9":
   version "7.25.9"
@@ -860,19 +887,19 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-template-literals@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.25.9.tgz#6dbd4a24e8fad024df76d1fac6a03cf413f60fe1"
-  integrity sha512-o97AE4syN71M/lxrCtQByzphAdlYluKPDBzDVzMmfCobUjjhAryZV0AIpRPrxN0eAkxXO6ZLEScmt+PNhj2OTw==
+"@babel/plugin-transform-template-literals@^7.26.8":
+  version "7.26.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.26.8.tgz#966b15d153a991172a540a69ad5e1845ced990b5"
+  integrity sha512-OmGDL5/J0CJPJZTHZbi2XpO0tyT2Ia7fzpW5GURwdtp2X3fMmN8au/ej6peC/T33/+CRiIpA8Krse8hFGVmT5Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.26.5"
 
-"@babel/plugin-transform-typeof-symbol@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.25.9.tgz#224ba48a92869ddbf81f9b4a5f1204bbf5a2bc4b"
-  integrity sha512-v61XqUMiueJROUv66BVIOi0Fv/CUuZuZMl5NkRoCVxLAnMexZ0A3kMe7vvZ0nulxMuMp0Mk6S5hNh48yki08ZA==
+"@babel/plugin-transform-typeof-symbol@^7.26.7":
+  version "7.26.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.26.7.tgz#d0e33acd9223744c1e857dbd6fa17bd0a3786937"
+  integrity sha512-jfoTXXZTgGg36BmhqT3cAYK5qkmqvJpvNrPhaK/52Vgjhw4Rq29s9UqpWWV0D6yuRmgiFH/BUVlkl96zJWqnaw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.26.5"
 
 "@babel/plugin-transform-unicode-escapes@^7.25.9":
   version "7.25.9"
@@ -905,14 +932,14 @@
     "@babel/helper-create-regexp-features-plugin" "^7.25.9"
     "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/preset-env@^7.26.0":
-  version "7.26.0"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.26.0.tgz#30e5c6bc1bcc54865bff0c5a30f6d4ccdc7fa8b1"
-  integrity sha512-H84Fxq0CQJNdPFT2DrfnylZ3cf5K43rGfWK4LJGPpjKHiZlk0/RzwEus3PDDZZg+/Er7lCA03MVacueUuXdzfw==
+"@babel/preset-env@^7.26.8":
+  version "7.26.8"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.26.8.tgz#7af0090829b606d2046db99679004731e1dc364d"
+  integrity sha512-um7Sy+2THd697S4zJEfv/U5MHGJzkN2xhtsR3T/SWRbVSic62nbISh51VVfU9JiO/L/Z97QczHTaFVkOU8IzNg==
   dependencies:
-    "@babel/compat-data" "^7.26.0"
-    "@babel/helper-compilation-targets" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/compat-data" "^7.26.8"
+    "@babel/helper-compilation-targets" "^7.26.5"
+    "@babel/helper-plugin-utils" "^7.26.5"
     "@babel/helper-validator-option" "^7.25.9"
     "@babel/plugin-bugfix-firefox-class-in-computed-class-key" "^7.25.9"
     "@babel/plugin-bugfix-safari-class-field-initializer-scope" "^7.25.9"
@@ -924,9 +951,9 @@
     "@babel/plugin-syntax-import-attributes" "^7.26.0"
     "@babel/plugin-syntax-unicode-sets-regex" "^7.18.6"
     "@babel/plugin-transform-arrow-functions" "^7.25.9"
-    "@babel/plugin-transform-async-generator-functions" "^7.25.9"
+    "@babel/plugin-transform-async-generator-functions" "^7.26.8"
     "@babel/plugin-transform-async-to-generator" "^7.25.9"
-    "@babel/plugin-transform-block-scoped-functions" "^7.25.9"
+    "@babel/plugin-transform-block-scoped-functions" "^7.26.5"
     "@babel/plugin-transform-block-scoping" "^7.25.9"
     "@babel/plugin-transform-class-properties" "^7.25.9"
     "@babel/plugin-transform-class-static-block" "^7.26.0"
@@ -937,7 +964,7 @@
     "@babel/plugin-transform-duplicate-keys" "^7.25.9"
     "@babel/plugin-transform-duplicate-named-capturing-groups-regex" "^7.25.9"
     "@babel/plugin-transform-dynamic-import" "^7.25.9"
-    "@babel/plugin-transform-exponentiation-operator" "^7.25.9"
+    "@babel/plugin-transform-exponentiation-operator" "^7.26.3"
     "@babel/plugin-transform-export-namespace-from" "^7.25.9"
     "@babel/plugin-transform-for-of" "^7.25.9"
     "@babel/plugin-transform-function-name" "^7.25.9"
@@ -946,12 +973,12 @@
     "@babel/plugin-transform-logical-assignment-operators" "^7.25.9"
     "@babel/plugin-transform-member-expression-literals" "^7.25.9"
     "@babel/plugin-transform-modules-amd" "^7.25.9"
-    "@babel/plugin-transform-modules-commonjs" "^7.25.9"
+    "@babel/plugin-transform-modules-commonjs" "^7.26.3"
     "@babel/plugin-transform-modules-systemjs" "^7.25.9"
     "@babel/plugin-transform-modules-umd" "^7.25.9"
     "@babel/plugin-transform-named-capturing-groups-regex" "^7.25.9"
     "@babel/plugin-transform-new-target" "^7.25.9"
-    "@babel/plugin-transform-nullish-coalescing-operator" "^7.25.9"
+    "@babel/plugin-transform-nullish-coalescing-operator" "^7.26.6"
     "@babel/plugin-transform-numeric-separator" "^7.25.9"
     "@babel/plugin-transform-object-rest-spread" "^7.25.9"
     "@babel/plugin-transform-object-super" "^7.25.9"
@@ -967,17 +994,17 @@
     "@babel/plugin-transform-shorthand-properties" "^7.25.9"
     "@babel/plugin-transform-spread" "^7.25.9"
     "@babel/plugin-transform-sticky-regex" "^7.25.9"
-    "@babel/plugin-transform-template-literals" "^7.25.9"
-    "@babel/plugin-transform-typeof-symbol" "^7.25.9"
+    "@babel/plugin-transform-template-literals" "^7.26.8"
+    "@babel/plugin-transform-typeof-symbol" "^7.26.7"
     "@babel/plugin-transform-unicode-escapes" "^7.25.9"
     "@babel/plugin-transform-unicode-property-regex" "^7.25.9"
     "@babel/plugin-transform-unicode-regex" "^7.25.9"
     "@babel/plugin-transform-unicode-sets-regex" "^7.25.9"
     "@babel/preset-modules" "0.1.6-no-external-plugins"
     babel-plugin-polyfill-corejs2 "^0.4.10"
-    babel-plugin-polyfill-corejs3 "^0.10.6"
+    babel-plugin-polyfill-corejs3 "^0.11.0"
     babel-plugin-polyfill-regenerator "^0.6.1"
-    core-js-compat "^3.38.1"
+    core-js-compat "^3.40.0"
     semver "^6.3.1"
 
 "@babel/preset-modules@0.1.6-no-external-plugins":
@@ -1019,6 +1046,15 @@
     "@babel/parser" "^7.25.9"
     "@babel/types" "^7.25.9"
 
+"@babel/template@^7.26.8":
+  version "7.26.8"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.26.8.tgz#db3898f47a17bab2f4c78ec1d0de38527c2ffe19"
+  integrity sha512-iNKaX3ZebKIsCvJ+0jd6embf+Aulaa3vNBqZ41kM7iTWjx5qzWKXGHiJUW3+nTpQ18SG11hdF8OAzKrpXkb96Q==
+  dependencies:
+    "@babel/code-frame" "^7.26.2"
+    "@babel/parser" "^7.26.8"
+    "@babel/types" "^7.26.8"
+
 "@babel/traverse@^7.25.9":
   version "7.25.9"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.25.9.tgz#a50f8fe49e7f69f53de5bea7e413cd35c5e13c84"
@@ -1032,6 +1068,19 @@
     debug "^4.3.1"
     globals "^11.1.0"
 
+"@babel/traverse@^7.26.8":
+  version "7.26.8"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.26.8.tgz#0a8a9c2b7cc9519eed14275f4fd2278ad46e8cc9"
+  integrity sha512-nic9tRkjYH0oB2dzr/JoGIm+4Q6SuYeLEiIiZDwBscRMYFJ+tMAz98fuel9ZnbXViA2I0HVSSRRK8DW5fjXStA==
+  dependencies:
+    "@babel/code-frame" "^7.26.2"
+    "@babel/generator" "^7.26.8"
+    "@babel/parser" "^7.26.8"
+    "@babel/template" "^7.26.8"
+    "@babel/types" "^7.26.8"
+    debug "^4.3.1"
+    globals "^11.1.0"
+
 "@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0":
   version "7.23.0"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.0.tgz#8c1f020c9df0e737e4e247c0619f58c68458aaeb"
@@ -1049,6 +1098,22 @@
     "@babel/helper-string-parser" "^7.25.9"
     "@babel/helper-validator-identifier" "^7.25.9"
 
+"@babel/types@^7.26.7":
+  version "7.26.7"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.26.7.tgz#5e2b89c0768e874d4d061961f3a5a153d71dc17a"
+  integrity sha512-t8kDRGrKXyp6+tjUh7hw2RLyclsW4TRoRvRHtSyAX9Bb5ldlFh+90YAYY6awRXrlB4G5G2izNeGySpATlFzmOg==
+  dependencies:
+    "@babel/helper-string-parser" "^7.25.9"
+    "@babel/helper-validator-identifier" "^7.25.9"
+
+"@babel/types@^7.26.8":
+  version "7.26.8"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.26.8.tgz#97dcdc190fab45be7f3dc073e3c11160d677c127"
+  integrity sha512-eUuWapzEGWFEpHFxgEaBG8e3n6S8L3MSu0oda755rOfabWPnh0Our1AozNFVUxGFIhbKgd1ksprsoDGMinTOTA==
+  dependencies:
+    "@babel/helper-string-parser" "^7.25.9"
+    "@babel/helper-validator-identifier" "^7.25.9"
+
 "@babel/types@^7.4.4":
   version "7.23.5"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.5.tgz#48d730a00c95109fa4393352705954d74fb5b602"
@@ -1313,10 +1378,130 @@
   resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz#2cbcf822bf3764c9658c4d2e568bd0c0cb748016"
   integrity sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==
 
-"@esbuild/linux-loong64@0.14.54":
-  version "0.14.54"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.14.54.tgz#de2a4be678bd4d0d1ffbb86e6de779cde5999028"
-  integrity sha512-bZBrLAIX1kpWelV0XemxBZllyRmM6vgFQQG2GdNb+r3Fkp0FOh1NJSvekXDs7jq70k4euu1cryLMfU+mTXlEpw==
+"@esbuild/aix-ppc64@0.25.0":
+  version "0.25.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.25.0.tgz#499600c5e1757a524990d5d92601f0ac3ce87f64"
+  integrity sha512-O7vun9Sf8DFjH2UtqK8Ku3LkquL9SZL8OLY1T5NZkA34+wG3OQF7cl4Ql8vdNzM6fzBbYfLaiRLIOZ+2FOCgBQ==
+
+"@esbuild/android-arm64@0.25.0":
+  version "0.25.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.25.0.tgz#b9b8231561a1dfb94eb31f4ee056b92a985c324f"
+  integrity sha512-grvv8WncGjDSyUBjN9yHXNt+cq0snxXbDxy5pJtzMKGmmpPxeAmAhWxXI+01lU5rwZomDgD3kJwulEnhTRUd6g==
+
+"@esbuild/android-arm@0.25.0":
+  version "0.25.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.25.0.tgz#ca6e7888942505f13e88ac9f5f7d2a72f9facd2b"
+  integrity sha512-PTyWCYYiU0+1eJKmw21lWtC+d08JDZPQ5g+kFyxP0V+es6VPPSUhM6zk8iImp2jbV6GwjX4pap0JFbUQN65X1g==
+
+"@esbuild/android-x64@0.25.0":
+  version "0.25.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.25.0.tgz#e765ea753bac442dfc9cb53652ce8bd39d33e163"
+  integrity sha512-m/ix7SfKG5buCnxasr52+LI78SQ+wgdENi9CqyCXwjVR2X4Jkz+BpC3le3AoBPYTC9NHklwngVXvbJ9/Akhrfg==
+
+"@esbuild/darwin-arm64@0.25.0":
+  version "0.25.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.25.0.tgz#fa394164b0d89d4fdc3a8a21989af70ef579fa2c"
+  integrity sha512-mVwdUb5SRkPayVadIOI78K7aAnPamoeFR2bT5nszFUZ9P8UpK4ratOdYbZZXYSqPKMHfS1wdHCJk1P1EZpRdvw==
+
+"@esbuild/darwin-x64@0.25.0":
+  version "0.25.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.25.0.tgz#91979d98d30ba6e7d69b22c617cc82bdad60e47a"
+  integrity sha512-DgDaYsPWFTS4S3nWpFcMn/33ZZwAAeAFKNHNa1QN0rI4pUjgqf0f7ONmXf6d22tqTY+H9FNdgeaAa+YIFUn2Rg==
+
+"@esbuild/freebsd-arm64@0.25.0":
+  version "0.25.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.0.tgz#b97e97073310736b430a07b099d837084b85e9ce"
+  integrity sha512-VN4ocxy6dxefN1MepBx/iD1dH5K8qNtNe227I0mnTRjry8tj5MRk4zprLEdG8WPyAPb93/e4pSgi1SoHdgOa4w==
+
+"@esbuild/freebsd-x64@0.25.0":
+  version "0.25.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.25.0.tgz#f3b694d0da61d9910ec7deff794d444cfbf3b6e7"
+  integrity sha512-mrSgt7lCh07FY+hDD1TxiTyIHyttn6vnjesnPoVDNmDfOmggTLXRv8Id5fNZey1gl/V2dyVK1VXXqVsQIiAk+A==
+
+"@esbuild/linux-arm64@0.25.0":
+  version "0.25.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.25.0.tgz#f921f699f162f332036d5657cad9036f7a993f73"
+  integrity sha512-9QAQjTWNDM/Vk2bgBl17yWuZxZNQIF0OUUuPZRKoDtqF2k4EtYbpyiG5/Dk7nqeK6kIJWPYldkOcBqjXjrUlmg==
+
+"@esbuild/linux-arm@0.25.0":
+  version "0.25.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.25.0.tgz#cc49305b3c6da317c900688995a4050e6cc91ca3"
+  integrity sha512-vkB3IYj2IDo3g9xX7HqhPYxVkNQe8qTK55fraQyTzTX/fxaDtXiEnavv9geOsonh2Fd2RMB+i5cbhu2zMNWJwg==
+
+"@esbuild/linux-ia32@0.25.0":
+  version "0.25.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.25.0.tgz#3e0736fcfab16cff042dec806247e2c76e109e19"
+  integrity sha512-43ET5bHbphBegyeqLb7I1eYn2P/JYGNmzzdidq/w0T8E2SsYL1U6un2NFROFRg1JZLTzdCoRomg8Rvf9M6W6Gg==
+
+"@esbuild/linux-loong64@0.25.0":
+  version "0.25.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.25.0.tgz#ea2bf730883cddb9dfb85124232b5a875b8020c7"
+  integrity sha512-fC95c/xyNFueMhClxJmeRIj2yrSMdDfmqJnyOY4ZqsALkDrrKJfIg5NTMSzVBr5YW1jf+l7/cndBfP3MSDpoHw==
+
+"@esbuild/linux-mips64el@0.25.0":
+  version "0.25.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.25.0.tgz#4cababb14eede09248980a2d2d8b966464294ff1"
+  integrity sha512-nkAMFju7KDW73T1DdH7glcyIptm95a7Le8irTQNO/qtkoyypZAnjchQgooFUDQhNAy4iu08N79W4T4pMBwhPwQ==
+
+"@esbuild/linux-ppc64@0.25.0":
+  version "0.25.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.25.0.tgz#8860a4609914c065373a77242e985179658e1951"
+  integrity sha512-NhyOejdhRGS8Iwv+KKR2zTq2PpysF9XqY+Zk77vQHqNbo/PwZCzB5/h7VGuREZm1fixhs4Q/qWRSi5zmAiO4Fw==
+
+"@esbuild/linux-riscv64@0.25.0":
+  version "0.25.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.25.0.tgz#baf26e20bb2d38cfb86ee282dff840c04f4ed987"
+  integrity sha512-5S/rbP5OY+GHLC5qXp1y/Mx//e92L1YDqkiBbO9TQOvuFXM+iDqUNG5XopAnXoRH3FjIUDkeGcY1cgNvnXp/kA==
+
+"@esbuild/linux-s390x@0.25.0":
+  version "0.25.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.25.0.tgz#8323afc0d6cb1b6dc6e9fd21efd9e1542c3640a4"
+  integrity sha512-XM2BFsEBz0Fw37V0zU4CXfcfuACMrppsMFKdYY2WuTS3yi8O1nFOhil/xhKTmE1nPmVyvQJjJivgDT+xh8pXJA==
+
+"@esbuild/linux-x64@0.25.0":
+  version "0.25.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.25.0.tgz#08fcf60cb400ed2382e9f8e0f5590bac8810469a"
+  integrity sha512-9yl91rHw/cpwMCNytUDxwj2XjFpxML0y9HAOH9pNVQDpQrBxHy01Dx+vaMu0N1CKa/RzBD2hB4u//nfc+Sd3Cw==
+
+"@esbuild/netbsd-arm64@0.25.0":
+  version "0.25.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.0.tgz#935c6c74e20f7224918fbe2e6c6fe865b6c6ea5b"
+  integrity sha512-RuG4PSMPFfrkH6UwCAqBzauBWTygTvb1nxWasEJooGSJ/NwRw7b2HOwyRTQIU97Hq37l3npXoZGYMy3b3xYvPw==
+
+"@esbuild/netbsd-x64@0.25.0":
+  version "0.25.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.25.0.tgz#414677cef66d16c5a4d210751eb2881bb9c1b62b"
+  integrity sha512-jl+qisSB5jk01N5f7sPCsBENCOlPiS/xptD5yxOx2oqQfyourJwIKLRA2yqWdifj3owQZCL2sn6o08dBzZGQzA==
+
+"@esbuild/openbsd-arm64@0.25.0":
+  version "0.25.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.0.tgz#8fd55a4d08d25cdc572844f13c88d678c84d13f7"
+  integrity sha512-21sUNbq2r84YE+SJDfaQRvdgznTD8Xc0oc3p3iW/a1EVWeNj/SdUCbm5U0itZPQYRuRTW20fPMWMpcrciH2EJw==
+
+"@esbuild/openbsd-x64@0.25.0":
+  version "0.25.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.25.0.tgz#0c48ddb1494bbc2d6bcbaa1429a7f465fa1dedde"
+  integrity sha512-2gwwriSMPcCFRlPlKx3zLQhfN/2WjJ2NSlg5TKLQOJdV0mSxIcYNTMhk3H3ulL/cak+Xj0lY1Ym9ysDV1igceg==
+
+"@esbuild/sunos-x64@0.25.0":
+  version "0.25.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.25.0.tgz#86ff9075d77962b60dd26203d7352f92684c8c92"
+  integrity sha512-bxI7ThgLzPrPz484/S9jLlvUAHYMzy6I0XiU1ZMeAEOBcS0VePBFxh1JjTQt3Xiat5b6Oh4x7UC7IwKQKIJRIg==
+
+"@esbuild/win32-arm64@0.25.0":
+  version "0.25.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.25.0.tgz#849c62327c3229467f5b5cd681bf50588442e96c"
+  integrity sha512-ZUAc2YK6JW89xTbXvftxdnYy3m4iHIkDtK3CLce8wg8M2L+YZhIvO1DKpxrd0Yr59AeNNkTiic9YLf6FTtXWMw==
+
+"@esbuild/win32-ia32@0.25.0":
+  version "0.25.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.25.0.tgz#f62eb480cd7cca088cb65bb46a6db25b725dc079"
+  integrity sha512-eSNxISBu8XweVEWG31/JzjkIGbGIJN/TrRoiSVZwZ6pkC6VX4Im/WV2cz559/TXLcYbcrDN8JtKgd9DJVIo8GA==
+
+"@esbuild/win32-x64@0.25.0":
+  version "0.25.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.25.0.tgz#c8e119a30a7c8d60b9d2e22d2073722dde3b710b"
+  integrity sha512-ZENoHJBxA20C2zFzh6AI4fT6RraMzjYw4xKWemRTRmRVtN9c5DcH9r/f2ihEkMjOW5eGgrwCslG/+Y/3bL+DHQ==
 
 "@eslint-community/eslint-utils@^4.2.0":
   version "4.4.0"
@@ -1535,6 +1720,11 @@
   resolved "https://registry.yarnpkg.com/@stimulus-components/password-visibility/-/password-visibility-3.0.0.tgz#314c1bae571ba13b9a4da6014f3e5c5b776fe4cc"
   integrity sha512-ikyuZ/4VX4YrCckVHDc4H6UkTr5UjtkxSH+UdlEIgP9v93W1Bbvnoao0hgQODm8cvNWigmpLpKoGUzgyjBlrdw==
 
+"@tailwindcss/container-queries@^0.1.1":
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/@tailwindcss/container-queries/-/container-queries-0.1.1.tgz#9a759ce2cb8736a4c6a0cb93aeb740573a731974"
+  integrity sha512-p18dswChx6WnTSaJCSGx6lTmrGzNNvm2FtXmiO6AuA1V4U5REyoqwmT6kgAsIMdjo07QdAfYXHJ4hnMtfHzWgA==
+
 "@tailwindcss/forms@^0.5.10":
   version "0.5.10"
   resolved "https://registry.yarnpkg.com/@tailwindcss/forms/-/forms-0.5.10.tgz#0a1cd67b6933402f1985a04595bd24f9785aa302"
@@ -1552,82 +1742,82 @@
     lodash.merge "^4.6.2"
     postcss-selector-parser "6.0.10"
 
-"@tiptap/core@^2.11.2":
-  version "2.11.2"
-  resolved "https://registry.yarnpkg.com/@tiptap/core/-/core-2.11.2.tgz#d9d4bd912ee12d4127180e60d2672605c208baf7"
-  integrity sha512-Z437c/sQg31yrRVgLJVkQuih+7Og5tjRx6FE/zE47QgEayqQ9yXH0LrTAbPiY6IfY1X+f2A0h3e5Y/WGD6rC3Q==
-
-"@tiptap/extension-bold@^2.11.2":
-  version "2.11.2"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-bold/-/extension-bold-2.11.2.tgz#e1a2b8ca2f7b5a2a2c1bed25d73dcd8bb474174c"
-  integrity sha512-pSls6UnKiPMm2c0m1viuZ0aFexxUmTRm17vDA2Gy5PhRm5qSsnHlSxyEuEcKNOi/rIx+oJehvG1oO4uI+kmCKg==
-
-"@tiptap/extension-bullet-list@^2.11.2":
-  version "2.11.2"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-bullet-list/-/extension-bullet-list-2.11.2.tgz#cad06f9c1cb7c448739b736f3e98a337a47ba6b7"
-  integrity sha512-zqZYT7lmmivEDEO+6w5bl5kV3UP1L2dw5mksyMGtxpvoDgbFHZ85+ron6SeHee8C7vJc6aIptc1p6NxIS5/l0A==
-
-"@tiptap/extension-document@^2.11.2":
-  version "2.11.2"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-document/-/extension-document-2.11.2.tgz#307aa0010d2074c05ffff043eedebe5571e84e4d"
-  integrity sha512-/EZhIAN1x7DYgGM0xv7y7wo5ceBmHb0+rOIPuBerVFeTn+VcC3tST/Q64bdvcxgNe2E59Ti0CUdYEA51wc2u5Q==
-
-"@tiptap/extension-hard-break@^2.11.2":
-  version "2.11.2"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-hard-break/-/extension-hard-break-2.11.2.tgz#54813af7264cdb808c86b0c386155dc1f6d812f8"
-  integrity sha512-FNcXemfuwkiP4drZ9m90BC6GD4nyikfYHYEUyYuVd74Mm6w5vXpueWXus3mUcdT78xTs1XpQVibDorilLu7X8w==
-
-"@tiptap/extension-italic@^2.11.2":
-  version "2.11.2"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-italic/-/extension-italic-2.11.2.tgz#f74051e6c767680bf43039b8f152736c0553f13e"
-  integrity sha512-652oTa+iDiR7sMtmePSy+303HSNJxvxmV/6IvQoMdffJU0oPiWcWnCCL0qrWgtHh15dplj36EtB/znENWbvVOw==
-
-"@tiptap/extension-link@^2.11.2":
-  version "2.11.2"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-link/-/extension-link-2.11.2.tgz#46096d6862a2c4f8dd18e9db9204959e4b1dbe0d"
-  integrity sha512-Mbre+JotLMUg9jdWWrwIReiRVMkA2kMzmtD2Aqy/n5P+wuI84898qIZSkhPEzDOGzp0mluUO/iGsz0NdTto/JQ==
+"@tiptap/core@^2.11.5":
+  version "2.11.5"
+  resolved "https://registry.yarnpkg.com/@tiptap/core/-/core-2.11.5.tgz#2bf1b08c4ca2467778d0a109634c45ab475522f4"
+  integrity sha512-jb0KTdUJaJY53JaN7ooY3XAxHQNoMYti/H6ANo707PsLXVeEqJ9o8+eBup1JU5CuwzrgnDc2dECt2WIGX9f8Jw==
+
+"@tiptap/extension-bold@^2.11.5":
+  version "2.11.5"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-bold/-/extension-bold-2.11.5.tgz#7fc13d835067fbee4ff2be83a694f5200ba50e41"
+  integrity sha512-OAq03MHEbl7MtYCUzGuwb0VpOPnM0k5ekMbEaRILFU5ZC7cEAQ36XmPIw1dQayrcuE8GZL35BKub2qtRxyC9iA==
+
+"@tiptap/extension-bullet-list@^2.11.5":
+  version "2.11.5"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-bullet-list/-/extension-bullet-list-2.11.5.tgz#84c6bf623c5dffcd73dd24d012c9636191031d43"
+  integrity sha512-VXwHlX6A/T6FAspnyjbKDO0TQ+oetXuat6RY1/JxbXphH42nLuBaGWJ6pgy6xMl6XY8/9oPkTNrfJw/8/eeRwA==
+
+"@tiptap/extension-document@^2.11.5":
+  version "2.11.5"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-document/-/extension-document-2.11.5.tgz#1d650d232df46cf07b83e0a5cc64db1c70057f37"
+  integrity sha512-7I4BRTpIux2a0O2qS3BDmyZ5LGp3pszKbix32CmeVh7lN9dV7W5reDqtJJ9FCZEEF+pZ6e1/DQA362dflwZw2g==
+
+"@tiptap/extension-hard-break@^2.11.5":
+  version "2.11.5"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-hard-break/-/extension-hard-break-2.11.5.tgz#cf9610846cb7ab0f3a8d8dc37fd1fcee6a39d72f"
+  integrity sha512-q9doeN+Yg9F5QNTG8pZGYfNye3tmntOwch683v0CCVCI4ldKaLZ0jG3NbBTq+mosHYdgOH2rNbIORlRRsQ+iYQ==
+
+"@tiptap/extension-italic@^2.11.5":
+  version "2.11.5"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-italic/-/extension-italic-2.11.5.tgz#63b09c7fb41ab64681983df7be8cf6bc330c0ede"
+  integrity sha512-9VGfb2/LfPhQ6TjzDwuYLRvw0A6VGbaIp3F+5Mql8XVdTBHb2+rhELbyhNGiGVR78CaB/EiKb6dO9xu/tBWSYA==
+
+"@tiptap/extension-link@^2.11.5":
+  version "2.11.5"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-link/-/extension-link-2.11.5.tgz#a2c3a92682233892413e3c1ec69d03a48815ab1e"
+  integrity sha512-4Iu/aPzevbYpe50xDI0ZkqRa6nkZ9eF270Ue2qaF3Ab47nehj+9Jl78XXzo8+LTyFMnrETI73TAs1aC/IGySeQ==
   dependencies:
     linkifyjs "^4.2.0"
 
-"@tiptap/extension-list-item@^2.11.2":
-  version "2.11.2"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-list-item/-/extension-list-item-2.11.2.tgz#4b81f934bdbe98ee5e1dabdb799f2f3bf095c44e"
-  integrity sha512-cxysDCvw45bem53qLZtTCkle1pttO4Y/FGqYm1hl66ol3cZsuLbjpOb4aDB6wRhyd701Ws6MjOYM+cZsmtTNpw==
-
-"@tiptap/extension-ordered-list@^2.11.2":
-  version "2.11.2"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-ordered-list/-/extension-ordered-list-2.11.2.tgz#37b2f0d614cb173934848ee72d730663868e5b41"
-  integrity sha512-TR8OqwKkQ0OCp40V9hcRJUcO1PSzCYWXy0mvW351lOYO8D6uE+1ouVkEV9qjXBC30sVCnQykSp/FR9UjsIuiVw==
-
-"@tiptap/extension-paragraph@^2.11.2":
-  version "2.11.2"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-paragraph/-/extension-paragraph-2.11.2.tgz#b4e99129b1c5959e2926b9563ced89755e0d4d81"
-  integrity sha512-iydTjeZbPJuqctOaAx7QebLPvz9J/hBxPptuhe4GZmqInknAk7+SFJagYeGNb14wfXKOvDZ9DMqv6mBiqSA90Q==
-
-"@tiptap/extension-placeholder@^2.11.2":
-  version "2.11.2"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-placeholder/-/extension-placeholder-2.11.2.tgz#de68ef4932141d6344b0c75f18916249c387883b"
-  integrity sha512-7rv6nylqX57Q+K+AH794Kg9U7OrLyujhXXqQvd9iZdBP7bTCNUlFu0cGlIyHdM/eWJjoUblZs0VLV2IApk4xjQ==
-
-"@tiptap/extension-strike@^2.11.2":
-  version "2.11.2"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-strike/-/extension-strike-2.11.2.tgz#9b5b698da5a024219e2ecf438c3b503d9b812fbe"
-  integrity sha512-n/rznmhqFlENGSlFY9t3pWnWzSmvDpUj3sjVhdpYteis+OCzabN9+c5KdQTBPMjtwRuRleQiKWnHmxvif0heEg==
-
-"@tiptap/extension-text@^2.11.2":
-  version "2.11.2"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-text/-/extension-text-2.11.2.tgz#743352716de6288191cd336fa1d676c391acda52"
-  integrity sha512-fJZeKYM5jeJ7NpS3FWLnC/NAvg+mZNbcTaRgXMo5ljBCgiMcYHhYg9p/RHk4SeICZBBpR9WSSZXHMACd9CbJiA==
-
-"@tiptap/extension-underline@^2.11.2":
-  version "2.11.2"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-underline/-/extension-underline-2.11.2.tgz#e6bb61ddbd48100b3b4de33822e24f766f7825bd"
-  integrity sha512-Gq7hfV3D/3E1zoE6JXSYZ3boKfbjebFu7IuQZ6w6QSS/IkGN8c6kW+WtkhOKN3jV7Z5uF5KIVp3XCqNIwChWNQ==
-
-"@tiptap/pm@^2.11.2":
-  version "2.11.2"
-  resolved "https://registry.yarnpkg.com/@tiptap/pm/-/pm-2.11.2.tgz#7f0cc0dcb11d8975958815c338848a1bbf2b400f"
-  integrity sha512-lNOMFRcD0mGy7Hf8tFMHW/fnglvq3dA0grs0QrSY4cHyYbH9BHtQjLMDceczXdXbXZq7nEqC40UBWNnqtaclpw==
+"@tiptap/extension-list-item@^2.11.5":
+  version "2.11.5"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-list-item/-/extension-list-item-2.11.5.tgz#6ada38dd4e6db889288242542bc0490b0908d190"
+  integrity sha512-Mp5RD/pbkfW1vdc6xMVxXYcta73FOwLmblQlFNn/l/E5/X1DUSA4iGhgDDH4EWO3swbs03x2f7Zka/Xoj3+WLg==
+
+"@tiptap/extension-ordered-list@^2.11.5":
+  version "2.11.5"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-ordered-list/-/extension-ordered-list-2.11.5.tgz#c81e33b5bc885450d412e9ea644cc666407e0c13"
+  integrity sha512-Cu8KwruBNWAaEfshRQR0yOSaUKAeEwxW7UgbvF9cN/zZuKgK5uZosPCPTehIFCcRe+TBpRtZQh+06f/gNYpYYg==
+
+"@tiptap/extension-paragraph@^2.11.5":
+  version "2.11.5"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-paragraph/-/extension-paragraph-2.11.5.tgz#05575f0264a435837483831eebffc5e3af279cb1"
+  integrity sha512-YFBWeg7xu/sBnsDIF/+nh9Arf7R0h07VZMd0id5Ydd2Qe3c1uIZwXxeINVtH0SZozuPIQFAT8ICe9M0RxmE+TA==
+
+"@tiptap/extension-placeholder@^2.11.5":
+  version "2.11.5"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-placeholder/-/extension-placeholder-2.11.5.tgz#de8412b486865b379f121a502ae3de8be7fa2d27"
+  integrity sha512-Pr+0Ju/l2ZvXMd9VQxtaoSZbs0BBp1jbBDqwms88ctpyvQFRfLSfSkqudQcSHyw2ROOz2E31p/7I7fpI8Y0CLA==
+
+"@tiptap/extension-strike@^2.11.5":
+  version "2.11.5"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-strike/-/extension-strike-2.11.5.tgz#94e214dcede09f6c5f99d0c58290a1d3f5db61eb"
+  integrity sha512-PVfUiCqrjvsLpbIoVlegSY8RlkR64F1Rr2RYmiybQfGbg+AkSZXDeO0eIrc03//4gua7D9DfIozHmAKv1KN3ow==
+
+"@tiptap/extension-text@^2.11.5":
+  version "2.11.5"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-text/-/extension-text-2.11.5.tgz#10cc6ec519aac71a6841ec9bd914ded747f6ec3f"
+  integrity sha512-Gq1WwyhFpCbEDrLPIHt5A8aLSlf8bfz4jm417c8F/JyU0J5dtYdmx0RAxjnLw1i7ZHE7LRyqqAoS0sl7JHDNSQ==
+
+"@tiptap/extension-underline@^2.11.5":
+  version "2.11.5"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-underline/-/extension-underline-2.11.5.tgz#eacf453fec192e517fdadecb7a81c976a08a9e05"
+  integrity sha512-YpWHXNIkSoRSuzT2cvgKpyJ2tTz3LzqkTM64uC+uTJ8cUkvXIWUWejJR42q8ma/mTlQe4lHff4IQ0Sf58Digtw==
+
+"@tiptap/pm@^2.11.5":
+  version "2.11.5"
+  resolved "https://registry.yarnpkg.com/@tiptap/pm/-/pm-2.11.5.tgz#6577e277e5a991c605a3dfcebde7c0b794d8def4"
+  integrity sha512-z9JFtqc5ZOsdQLd9vRnXfTCQ8v5ADAfRt9Nm7SqP6FUHII8E1hs38ACzf5xursmth/VonJYb5+73Pqxk1hGIPw==
   dependencies:
     prosemirror-changeset "^2.2.1"
     prosemirror-collab "^1.3.1"
@@ -1643,7 +1833,7 @@
     prosemirror-schema-basic "^1.2.3"
     prosemirror-schema-list "^1.4.1"
     prosemirror-state "^1.4.3"
-    prosemirror-tables "^1.6.1"
+    prosemirror-tables "^1.6.3"
     prosemirror-trailing-node "^3.0.0"
     prosemirror-transform "^1.10.2"
     prosemirror-view "^1.37.0"
@@ -1660,6 +1850,11 @@
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.1.tgz#aa22750962f3bf0e79d753d3cc067f010c95f194"
   integrity sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==
 
+"@types/gensync@^1.0.0":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@types/gensync/-/gensync-1.0.4.tgz#7122d8f0cd3bf437f9725cc95b180197190cf50b"
+  integrity sha512-C3YYeRQWp2fmq9OryX+FoDy8nXS6scQ7dPptD8LnFDAUNcKWJjXQKDNJD3HVm+kOUsXhTOkpi69vI4EuAr95bA==
+
 "@types/json5@^0.0.29":
   version "0.0.29"
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
@@ -1705,10 +1900,10 @@
   resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
   integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
 
-"@yaireo/tagify@^4.33.1":
-  version "4.33.1"
-  resolved "https://registry.yarnpkg.com/@yaireo/tagify/-/tagify-4.33.1.tgz#bed901b8367c8dbea39ba7a8d646e9e83a284f16"
-  integrity sha512-V+jMHsGVCLIn5vgF+UaC413VThsXzwVyMp4TiUyjXzWwXXubmObLJ/LgokN5LXkQJNAzzpHWLILzvoQV7GmNog==
+"@yaireo/tagify@^4.33.2":
+  version "4.33.2"
+  resolved "https://registry.yarnpkg.com/@yaireo/tagify/-/tagify-4.33.2.tgz#496290622831d7700c8e3c9f730f9988eebb3364"
+  integrity sha512-0r6c9ky3Vguj4pOKGy/sGGcfbfR+5zmZ7u4+1DWTf6v9z71cDksDp7A7l9g9mxlSZ1cs9Wk4pp/GEWfr8muykw==
 
 acorn-jsx@^5.3.2:
   version "5.3.2"
@@ -1919,13 +2114,13 @@ babel-plugin-polyfill-corejs2@^0.4.10:
     "@babel/helper-define-polyfill-provider" "^0.6.1"
     semver "^6.3.1"
 
-babel-plugin-polyfill-corejs3@^0.10.6:
-  version "0.10.6"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.10.6.tgz#2deda57caef50f59c525aeb4964d3b2f867710c7"
-  integrity sha512-b37+KR2i/khY5sKmWNVQAnitvquQbNdWy6lJdsr0kmquCKEEUgMKK4SboVM3HtfnZilfjr4MMQ7vY58FVWDtIA==
+babel-plugin-polyfill-corejs3@^0.11.0:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.11.1.tgz#4e4e182f1bb37c7ba62e2af81d8dd09df31344f6"
+  integrity sha512-yGCqvBT4rwMczo28xkH/noxJ6MZ4nJfkVYdoDaC/utLtWrXxv27HVrzAeSbqR8SxDsp46n0YF47EbHoixy6rXQ==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.6.2"
-    core-js-compat "^3.38.0"
+    "@babel/helper-define-polyfill-provider" "^0.6.3"
+    core-js-compat "^3.40.0"
 
 babel-plugin-polyfill-regenerator@^0.6.1:
   version "0.6.1"
@@ -1996,7 +2191,7 @@ browserslist@^4.23.3:
     node-releases "^2.0.18"
     update-browserslist-db "^1.1.0"
 
-browserslist@^4.24.0, browserslist@^4.24.2:
+browserslist@^4.24.0:
   version "4.24.2"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.24.2.tgz#f5845bc91069dbd55ee89faf9822e1d885d16580"
   integrity sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==
@@ -2006,6 +2201,16 @@ browserslist@^4.24.0, browserslist@^4.24.2:
     node-releases "^2.0.18"
     update-browserslist-db "^1.1.1"
 
+browserslist@^4.24.3:
+  version "4.24.4"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.24.4.tgz#c6b2865a3f08bcb860a0e827389003b9fe686e4b"
+  integrity sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==
+  dependencies:
+    caniuse-lite "^1.0.30001688"
+    electron-to-chromium "^1.5.73"
+    node-releases "^2.0.19"
+    update-browserslist-db "^1.1.1"
+
 call-bind@^1.0.0, call-bind@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
@@ -2044,25 +2249,15 @@ camelcase-css@^2.0.1:
   resolved "https://registry.yarnpkg.com/camelcase-css/-/camelcase-css-2.0.1.tgz#ee978f6947914cc30c6b44741b6ed1df7f043fd5"
   integrity sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==
 
-caniuse-lite@^1.0.30001449, caniuse-lite@^1.0.30001464:
-  version "1.0.30001486"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001486.tgz#56a08885228edf62cbe1ac8980f2b5dae159997e"
-  integrity sha512-uv7/gXuHi10Whlj0pp5q/tsK/32J2QSqVRKQhs2j8VsDCjgyruAh/eEXHF822VqO9yT6iZKw3nRwZRSPBE9OQg==
+caniuse-lite@^1.0.30001449, caniuse-lite@^1.0.30001464, caniuse-lite@^1.0.30001565, caniuse-lite@^1.0.30001646, caniuse-lite@^1.0.30001669:
+  version "1.0.30001696"
+  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001696.tgz"
+  integrity sha512-pDCPkvzfa39ehJtJ+OwGT/2yvT2SbjfHhiIW2LWOAcMQ7BzwxT/XuyUp4OTOd0XFWA6BKw0JalnBHgSi5DGJBQ==
 
-caniuse-lite@^1.0.30001565:
-  version "1.0.30001566"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001566.tgz#61a8e17caf3752e3e426d4239c549ebbb37fef0d"
-  integrity sha512-ggIhCsTxmITBAMmK8yZjEhCO5/47jKXPu6Dha/wuCS4JePVL+3uiDEBuhu2aIoT+bqTOR8L76Ip1ARL9xYsEJA==
-
-caniuse-lite@^1.0.30001646:
-  version "1.0.30001650"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001650.tgz#dd1eba0938e39536d184c3c99b2569a13788bc16"
-  integrity sha512-fgEc7hP/LB7iicdXHUI9VsBsMZmUmlVJeQP2qqQW+3lkqVhbmjEU8zp+h5stWeilX+G7uXuIUIIlWlDw9jdt8g==
-
-caniuse-lite@^1.0.30001669:
-  version "1.0.30001676"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001676.tgz#fe133d41fe74af8f7cc93b8a714c3e86a86e6f04"
-  integrity sha512-Qz6zwGCiPghQXGJvgQAem79esjitvJ+CxSbSQkW9H/UX5hg8XM88d4lp2W+MEQ81j+Hip58Il+jGVdazk1z9cw==
+caniuse-lite@^1.0.30001688:
+  version "1.0.30001699"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001699.tgz#a102cf330d153bf8c92bfb5be3cd44c0a89c8c12"
+  integrity sha512-b+uH5BakXZ9Do9iK+CkDmctUSEqZl+SP056vc5usa0PL+ev5OHw003rZXcnjNDv3L8P5j6rwT6C0BPKSikW08w==
 
 chalk@^2.4.2:
   version "2.4.2"
@@ -2190,19 +2385,12 @@ convert-source-map@^2.0.0:
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
   integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
 
-core-js-compat@^3.38.0:
-  version "3.38.1"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.38.1.tgz#2bc7a298746ca5a7bcb9c164bcb120f2ebc09a09"
-  integrity sha512-JRH6gfXxGmrzF3tZ57lFx97YARxCXPaMzPo6jELZhv88pBH5VXpQ+y0znKGlFnzuaihqhLbefxSJxWJMPtfDzw==
-  dependencies:
-    browserslist "^4.23.3"
-
-core-js-compat@^3.38.1:
-  version "3.39.0"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.39.0.tgz#b12dccb495f2601dc860bdbe7b4e3ffa8ba63f61"
-  integrity sha512-VgEUx3VwlExr5no0tXlBt+silBvhTryPwCXRI2Id1PN8WTKu7MreethvddqOubrYxkFdv/RnYrqlv1sFNAUelw==
+core-js-compat@^3.40.0:
+  version "3.40.0"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.40.0.tgz#7485912a5a4a4315c2fdb2cbdc623e6881c88b38"
+  integrity sha512-0XEDpr5y5mijvw8Lbc6E5AkjrHfp7eEoPlu36SWeAbcL8fn1G1ANe8DBlo2XoNN89oVpxWwOjYIPVzR4ZvsKCQ==
   dependencies:
-    browserslist "^4.24.2"
+    browserslist "^4.24.3"
 
 core-js@^3.40.0:
   version "3.40.0"
@@ -2395,6 +2583,13 @@ dompurify@^3.2.3:
   optionalDependencies:
     "@types/trusted-types" "^2.0.7"
 
+dompurify@^3.2.4:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.2.4.tgz#af5a5a11407524431456cf18836c55d13441cd8e"
+  integrity sha512-ysFSFEDVduQpyhzAob/kkuJjf5zWkZD8/A9ywSp1byueyuCfHamrCBa14/Oc2iiB0e51B+NpxSl5gmzn+Ms/mg==
+  optionalDependencies:
+    "@types/trusted-types" "^2.0.7"
+
 eastasianwidth@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
@@ -2436,6 +2631,11 @@ electron-to-chromium@^1.5.41:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.50.tgz#d9ba818da7b2b5ef1f3dd32bce7046feb7e93234"
   integrity sha512-eMVObiUQ2LdgeO1F/ySTXsvqvxb6ZH2zPGaMYsWzRDdOddUa77tdmI0ltg+L16UpbWdhPmuF3wIQYyQq65WfZw==
 
+electron-to-chromium@^1.5.73:
+  version "1.5.98"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.98.tgz#bdd59c95042fa8f6483893602b1530c8752baebc"
+  integrity sha512-bI/LbtRBxU2GzK7KK5xxFd2y9Lf9XguHooPYbcXWy6wUoT8NMnffsvRhPmSeUHLSDKAEtKuTaEtK4Ms15zkIEA==
+
 emoji-regex@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
@@ -2655,91 +2855,6 @@ es-to-primitive@^1.2.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
-esbuild-android-64@0.14.54:
-  version "0.14.54"
-  resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.14.54.tgz#505f41832884313bbaffb27704b8bcaa2d8616be"
-  integrity sha512-Tz2++Aqqz0rJ7kYBfz+iqyE3QMycD4vk7LBRyWaAVFgFtQ/O8EJOnVmTOiDWYZ/uYzB4kvP+bqejYdVKzE5lAQ==
-
-esbuild-android-arm64@0.14.54:
-  version "0.14.54"
-  resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.54.tgz#8ce69d7caba49646e009968fe5754a21a9871771"
-  integrity sha512-F9E+/QDi9sSkLaClO8SOV6etqPd+5DgJje1F9lOWoNncDdOBL2YF59IhsWATSt0TLZbYCf3pNlTHvVV5VfHdvg==
-
-esbuild-darwin-64@0.14.54:
-  version "0.14.54"
-  resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.54.tgz#24ba67b9a8cb890a3c08d9018f887cc221cdda25"
-  integrity sha512-jtdKWV3nBviOd5v4hOpkVmpxsBy90CGzebpbO9beiqUYVMBtSc0AL9zGftFuBon7PNDcdvNCEuQqw2x0wP9yug==
-
-esbuild-darwin-arm64@0.14.54:
-  version "0.14.54"
-  resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.54.tgz#3f7cdb78888ee05e488d250a2bdaab1fa671bf73"
-  integrity sha512-OPafJHD2oUPyvJMrsCvDGkRrVCar5aVyHfWGQzY1dWnzErjrDuSETxwA2HSsyg2jORLY8yBfzc1MIpUkXlctmw==
-
-esbuild-freebsd-64@0.14.54:
-  version "0.14.54"
-  resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.54.tgz#09250f997a56ed4650f3e1979c905ffc40bbe94d"
-  integrity sha512-OKwd4gmwHqOTp4mOGZKe/XUlbDJ4Q9TjX0hMPIDBUWWu/kwhBAudJdBoxnjNf9ocIB6GN6CPowYpR/hRCbSYAg==
-
-esbuild-freebsd-arm64@0.14.54:
-  version "0.14.54"
-  resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.54.tgz#bafb46ed04fc5f97cbdb016d86947a79579f8e48"
-  integrity sha512-sFwueGr7OvIFiQT6WeG0jRLjkjdqWWSrfbVwZp8iMP+8UHEHRBvlaxL6IuKNDwAozNUmbb8nIMXa7oAOARGs1Q==
-
-esbuild-linux-32@0.14.54:
-  version "0.14.54"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.14.54.tgz#e2a8c4a8efdc355405325033fcebeb941f781fe5"
-  integrity sha512-1ZuY+JDI//WmklKlBgJnglpUL1owm2OX+8E1syCD6UAxcMM/XoWd76OHSjl/0MR0LisSAXDqgjT3uJqT67O3qw==
-
-esbuild-linux-64@0.14.54:
-  version "0.14.54"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.14.54.tgz#de5fdba1c95666cf72369f52b40b03be71226652"
-  integrity sha512-EgjAgH5HwTbtNsTqQOXWApBaPVdDn7XcK+/PtJwZLT1UmpLoznPd8c5CxqsH2dQK3j05YsB3L17T8vE7cp4cCg==
-
-esbuild-linux-arm64@0.14.54:
-  version "0.14.54"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.54.tgz#dae4cd42ae9787468b6a5c158da4c84e83b0ce8b"
-  integrity sha512-WL71L+0Rwv+Gv/HTmxTEmpv0UgmxYa5ftZILVi2QmZBgX3q7+tDeOQNqGtdXSdsL8TQi1vIaVFHUPDe0O0kdig==
-
-esbuild-linux-arm@0.14.54:
-  version "0.14.54"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.54.tgz#a2c1dff6d0f21dbe8fc6998a122675533ddfcd59"
-  integrity sha512-qqz/SjemQhVMTnvcLGoLOdFpCYbz4v4fUo+TfsWG+1aOu70/80RV6bgNpR2JCrppV2moUQkww+6bWxXRL9YMGw==
-
-esbuild-linux-mips64le@0.14.54:
-  version "0.14.54"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.54.tgz#d9918e9e4cb972f8d6dae8e8655bf9ee131eda34"
-  integrity sha512-qTHGQB8D1etd0u1+sB6p0ikLKRVuCWhYQhAHRPkO+OF3I/iSlTKNNS0Lh2Oc0g0UFGguaFZZiPJdJey3AGpAlw==
-
-esbuild-linux-ppc64le@0.14.54:
-  version "0.14.54"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.54.tgz#3f9a0f6d41073fb1a640680845c7de52995f137e"
-  integrity sha512-j3OMlzHiqwZBDPRCDFKcx595XVfOfOnv68Ax3U4UKZ3MTYQB5Yz3X1mn5GnodEVYzhtZgxEBidLWeIs8FDSfrQ==
-
-esbuild-linux-riscv64@0.14.54:
-  version "0.14.54"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.54.tgz#618853c028178a61837bc799d2013d4695e451c8"
-  integrity sha512-y7Vt7Wl9dkOGZjxQZnDAqqn+XOqFD7IMWiewY5SPlNlzMX39ocPQlOaoxvT4FllA5viyV26/QzHtvTjVNOxHZg==
-
-esbuild-linux-s390x@0.14.54:
-  version "0.14.54"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.54.tgz#d1885c4c5a76bbb5a0fe182e2c8c60eb9e29f2a6"
-  integrity sha512-zaHpW9dziAsi7lRcyV4r8dhfG1qBidQWUXweUjnw+lliChJqQr+6XD71K41oEIC3Mx1KStovEmlzm+MkGZHnHA==
-
-esbuild-netbsd-64@0.14.54:
-  version "0.14.54"
-  resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.54.tgz#69ae917a2ff241b7df1dbf22baf04bd330349e81"
-  integrity sha512-PR01lmIMnfJTgeU9VJTDY9ZerDWVFIUzAtJuDHwwceppW7cQWjBBqP48NdeRtoP04/AtO9a7w3viI+PIDr6d+w==
-
-esbuild-openbsd-64@0.14.54:
-  version "0.14.54"
-  resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.54.tgz#db4c8495287a350a6790de22edea247a57c5d47b"
-  integrity sha512-Qyk7ikT2o7Wu76UsvvDS5q0amJvmRzDyVlL0qf5VLsLchjCa1+IAvd8kTBgUxD7VBUUVgItLkk609ZHUc1oCaw==
-
-esbuild-sunos-64@0.14.54:
-  version "0.14.54"
-  resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.54.tgz#54287ee3da73d3844b721c21bc80c1dc7e1bf7da"
-  integrity sha512-28GZ24KmMSeKi5ueWzMcco6EBHStL3B6ubM7M51RmPwXQGLe0teBGJocmWhgwccA1GeFXqxzILIxXpHbl9Q/Kw==
-
 esbuild-visualizer@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/esbuild-visualizer/-/esbuild-visualizer-0.3.1.tgz#eb3e873a4bbd95a5e72b5a8ae2d6d260d47ee5a6"
@@ -2749,47 +2864,36 @@ esbuild-visualizer@^0.3.1:
     open "^7.4.2"
     yargs "^16.2.0"
 
-esbuild-windows-32@0.14.54:
-  version "0.14.54"
-  resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.14.54.tgz#f8aaf9a5667630b40f0fb3aa37bf01bbd340ce31"
-  integrity sha512-T+rdZW19ql9MjS7pixmZYVObd9G7kcaZo+sETqNH4RCkuuYSuv9AGHUVnPoP9hhuE1WM1ZimHz1CIBHBboLU7w==
-
-esbuild-windows-64@0.14.54:
-  version "0.14.54"
-  resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.14.54.tgz#bf54b51bd3e9b0f1886ffdb224a4176031ea0af4"
-  integrity sha512-AoHTRBUuYwXtZhjXZbA1pGfTo8cJo3vZIcWGLiUcTNgHpJJMC1rVA44ZereBHMJtotyN71S8Qw0npiCIkW96cQ==
-
-esbuild-windows-arm64@0.14.54:
-  version "0.14.54"
-  resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.54.tgz#937d15675a15e4b0e4fafdbaa3a01a776a2be982"
-  integrity sha512-M0kuUvXhot1zOISQGXwWn6YtS+Y/1RT9WrVIOywZnJHo3jCDyewAc79aKNQWFCQm+xNHVTq9h8dZKvygoXQQRg==
-
-esbuild@^0.14.54:
-  version "0.14.54"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.14.54.tgz#8b44dcf2b0f1a66fc22459943dccf477535e9aa2"
-  integrity sha512-Cy9llcy8DvET5uznocPyqL3BFRrFXSVqbgpMJ9Wz8oVjZlh/zUSNbPRbov0VX7VxN2JH1Oa0uNxZ7eLRb62pJA==
+esbuild@^0.25.0:
+  version "0.25.0"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.25.0.tgz#0de1787a77206c5a79eeb634a623d39b5006ce92"
+  integrity sha512-BXq5mqc8ltbaN34cDqWuYKyNhX8D/Z0J1xdtdQ8UcIIIyJyz+ZMKUt58tF3SrZ85jcfN/PZYhjR5uDQAYNVbuw==
   optionalDependencies:
-    "@esbuild/linux-loong64" "0.14.54"
-    esbuild-android-64 "0.14.54"
-    esbuild-android-arm64 "0.14.54"
-    esbuild-darwin-64 "0.14.54"
-    esbuild-darwin-arm64 "0.14.54"
-    esbuild-freebsd-64 "0.14.54"
-    esbuild-freebsd-arm64 "0.14.54"
-    esbuild-linux-32 "0.14.54"
-    esbuild-linux-64 "0.14.54"
-    esbuild-linux-arm "0.14.54"
-    esbuild-linux-arm64 "0.14.54"
-    esbuild-linux-mips64le "0.14.54"
-    esbuild-linux-ppc64le "0.14.54"
-    esbuild-linux-riscv64 "0.14.54"
-    esbuild-linux-s390x "0.14.54"
-    esbuild-netbsd-64 "0.14.54"
-    esbuild-openbsd-64 "0.14.54"
-    esbuild-sunos-64 "0.14.54"
-    esbuild-windows-32 "0.14.54"
-    esbuild-windows-64 "0.14.54"
-    esbuild-windows-arm64 "0.14.54"
+    "@esbuild/aix-ppc64" "0.25.0"
+    "@esbuild/android-arm" "0.25.0"
+    "@esbuild/android-arm64" "0.25.0"
+    "@esbuild/android-x64" "0.25.0"
+    "@esbuild/darwin-arm64" "0.25.0"
+    "@esbuild/darwin-x64" "0.25.0"
+    "@esbuild/freebsd-arm64" "0.25.0"
+    "@esbuild/freebsd-x64" "0.25.0"
+    "@esbuild/linux-arm" "0.25.0"
+    "@esbuild/linux-arm64" "0.25.0"
+    "@esbuild/linux-ia32" "0.25.0"
+    "@esbuild/linux-loong64" "0.25.0"
+    "@esbuild/linux-mips64el" "0.25.0"
+    "@esbuild/linux-ppc64" "0.25.0"
+    "@esbuild/linux-riscv64" "0.25.0"
+    "@esbuild/linux-s390x" "0.25.0"
+    "@esbuild/linux-x64" "0.25.0"
+    "@esbuild/netbsd-arm64" "0.25.0"
+    "@esbuild/netbsd-x64" "0.25.0"
+    "@esbuild/openbsd-arm64" "0.25.0"
+    "@esbuild/openbsd-x64" "0.25.0"
+    "@esbuild/sunos-x64" "0.25.0"
+    "@esbuild/win32-arm64" "0.25.0"
+    "@esbuild/win32-ia32" "0.25.0"
+    "@esbuild/win32-x64" "0.25.0"
 
 escalade@^3.1.1:
   version "3.1.1"
@@ -3897,6 +4001,11 @@ node-releases@^2.0.18:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.18.tgz#f010e8d35e2fe8d6b2944f03f70213ecedc4ca3f"
   integrity sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==
 
+node-releases@^2.0.19:
+  version "2.0.19"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.19.tgz#9e445a52950951ec4d177d843af370b411caf314"
+  integrity sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==
+
 node-releases@^2.0.8:
   version "2.0.10"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.10.tgz#c311ebae3b6a148c89b1813fd7c4d3c024ef537f"
@@ -4531,10 +4640,10 @@ postcss@^8.4.47:
     picocolors "^1.1.0"
     source-map-js "^1.2.1"
 
-postcss@^8.5.1:
-  version "8.5.1"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.5.1.tgz#e2272a1f8a807fafa413218245630b5db10a3214"
-  integrity sha512-6oz2beyjc5VMn/KV1pPw8fliQkhBXrVn1Z3TVyqZxU8kZpzEKhBdmCFqI6ZbmGtamQvQGuU1sgPTk8ZrXDD7jQ==
+postcss@^8.5.2:
+  version "8.5.2"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.5.2.tgz#e7b99cb9d2ec3e8dd424002e7c16517cb2b846bd"
+  integrity sha512-MjOadfU3Ys9KYoX0AdkBlFEF1Vx37uCCeN4ZHnmwm9FfpbsGWMZeBLMmmpY+6Ocqod7mkdZ0DT31OlbsFrLlkA==
   dependencies:
     nanoid "^3.3.8"
     picocolors "^1.1.1"
@@ -4651,7 +4760,7 @@ prosemirror-inputrules@^1.4.0:
     prosemirror-state "^1.0.0"
     prosemirror-transform "^1.0.0"
 
-prosemirror-keymap@^1.0.0, prosemirror-keymap@^1.1.2, prosemirror-keymap@^1.2.2:
+prosemirror-keymap@^1.0.0, prosemirror-keymap@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/prosemirror-keymap/-/prosemirror-keymap-1.2.2.tgz#14a54763a29c7b2704f561088ccf3384d14eb77e"
   integrity sha512-EAlXoksqC6Vbocqc0GtzCruZEzYgrn+iiGnNjsJsH4mrnIGex4qbLdWWNza3AW5W36ZRrlBID0eM6bdKH4OStQ==
@@ -4678,7 +4787,7 @@ prosemirror-menu@^1.2.4:
     prosemirror-history "^1.0.0"
     prosemirror-state "^1.0.0"
 
-prosemirror-model@1.22.2, prosemirror-model@^1.0.0, prosemirror-model@^1.16.0, prosemirror-model@^1.19.0, prosemirror-model@^1.20.0, prosemirror-model@^1.21.0, prosemirror-model@^1.23.0, prosemirror-model@^1.8.1:
+prosemirror-model@1.22.2, prosemirror-model@^1.0.0, prosemirror-model@^1.16.0, prosemirror-model@^1.19.0, prosemirror-model@^1.20.0, prosemirror-model@^1.21.0, prosemirror-model@^1.23.0, prosemirror-model@^1.24.1:
   version "1.22.2"
   resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.22.2.tgz#9bae923c4c4149eee59ff61a5b390c26011a26b4"
   integrity sha512-I4lS7HHIW47D0Xv/gWmi4iUWcQIDYaJKd8Hk4+lcSps+553FlQrhmxtItpEvTr75iAruhzVShVp6WUwsT6Boww==
@@ -4701,7 +4810,7 @@ prosemirror-schema-list@^1.4.1:
     prosemirror-state "^1.0.0"
     prosemirror-transform "^1.7.3"
 
-prosemirror-state@^1.0.0, prosemirror-state@^1.2.2, prosemirror-state@^1.3.1, prosemirror-state@^1.4.3:
+prosemirror-state@^1.0.0, prosemirror-state@^1.2.2, prosemirror-state@^1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/prosemirror-state/-/prosemirror-state-1.4.3.tgz#94aecf3ffd54ec37e87aa7179d13508da181a080"
   integrity sha512-goFKORVbvPuAQaXhpbemJFRKJ2aixr+AZMGiquiqKxaucC6hlpHNZHWgz5R7dS4roHiwq9vDctE//CZ++o0W1Q==
@@ -4710,16 +4819,16 @@ prosemirror-state@^1.0.0, prosemirror-state@^1.2.2, prosemirror-state@^1.3.1, pr
     prosemirror-transform "^1.0.0"
     prosemirror-view "^1.27.0"
 
-prosemirror-tables@^1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/prosemirror-tables/-/prosemirror-tables-1.6.1.tgz#8df27facbf7632a574afb32a665aaadf7f2ed69a"
-  integrity sha512-p8WRJNA96jaNQjhJolmbxTzd6M4huRE5xQ8OxjvMhQUP0Nzpo4zz6TztEiwk6aoqGBhz9lxRWR1yRZLlpQN98w==
+prosemirror-tables@^1.6.3:
+  version "1.6.3"
+  resolved "https://registry.yarnpkg.com/prosemirror-tables/-/prosemirror-tables-1.6.3.tgz#a94e2922c271396ee00603d3839e0c64c5bb2ca7"
+  integrity sha512-8B0X6PjAkXaHKntKndetNquxLIhWDDTybON1N4flKMY9Bq8/rm5k2ddW6X6LvFpqJBQeiKRp4yG3FqI/zOyQuA==
   dependencies:
-    prosemirror-keymap "^1.1.2"
-    prosemirror-model "^1.8.1"
-    prosemirror-state "^1.3.1"
-    prosemirror-transform "^1.2.1"
-    prosemirror-view "^1.13.3"
+    prosemirror-keymap "^1.2.2"
+    prosemirror-model "^1.24.1"
+    prosemirror-state "^1.4.3"
+    prosemirror-transform "^1.10.2"
+    prosemirror-view "^1.37.1"
 
 prosemirror-trailing-node@^3.0.0:
   version "3.0.0"
@@ -4729,7 +4838,7 @@ prosemirror-trailing-node@^3.0.0:
     "@remirror/core-constants" "3.0.0"
     escape-string-regexp "^4.0.0"
 
-prosemirror-transform@^1.0.0, prosemirror-transform@^1.1.0, prosemirror-transform@^1.2.1, prosemirror-transform@^1.7.3:
+prosemirror-transform@^1.0.0, prosemirror-transform@^1.1.0, prosemirror-transform@^1.7.3:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.8.0.tgz#a47c64a3c373c1bd0ff46e95be3210c8dda0cd11"
   integrity sha512-BaSBsIMv52F1BVVMvOmp1yzD3u65uC3HTzCBQV1WDPqJRQ2LuHKcyfn0jwqodo8sR9vVzMzZyI+Dal5W9E6a9A==
@@ -4743,7 +4852,7 @@ prosemirror-transform@^1.10.2:
   dependencies:
     prosemirror-model "^1.21.0"
 
-prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.13.3, prosemirror-view@^1.27.0, prosemirror-view@^1.31.0:
+prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.27.0, prosemirror-view@^1.31.0:
   version "1.32.7"
   resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.32.7.tgz#b9c4e8471daeba79489befa59eaeaeb4cd2e2653"
   integrity sha512-pvxiOoD4shW41X5bYDjRQk3DSG4fMqxh36yPMt7VYgU3dWRmqFzWJM/R6zeo1KtC8nyk717ZbQND3CC9VNeptw==
@@ -4761,6 +4870,15 @@ prosemirror-view@^1.37.0:
     prosemirror-state "^1.0.0"
     prosemirror-transform "^1.1.0"
 
+prosemirror-view@^1.37.1:
+  version "1.37.2"
+  resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.37.2.tgz#e16b92611c6d0f30695606724dc4a9575ce7ca6b"
+  integrity sha512-ApcyrfV/cRcaL65on7TQcfWElwLyOgIjnIynfAuV+fIdlpbSvSWRwfuPaH7T5mo4AbO/FID29qOtjiDIKGWyog==
+  dependencies:
+    prosemirror-model "^1.20.0"
+    prosemirror-state "^1.0.0"
+    prosemirror-transform "^1.1.0"
+
 punycode.js@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/punycode.js/-/punycode.js-2.3.1.tgz#6b53e56ad75588234e79f4affa90972c7dd8cdb7"