diff --git a/app/builders/better_together/navigation_builder.rb b/app/builders/better_together/navigation_builder.rb
index 5f0e759ed..13b224148 100644
--- a/app/builders/better_together/navigation_builder.rb
+++ b/app/builders/better_together/navigation_builder.rb
@@ -62,9 +62,9 @@ def build_better_together # rubocop:todo Metrics/MethodLength, Metrics/AbcSize
           )
 
           # Add children to Better Together Navigation Item
-          better_together_nav_item.create_children(better_together_pages, area.reload)
+          better_together_nav_item.create_children(better_together_pages, area)
 
-          area.save!
+          area.reload.save!
         end
       end
       # rubocop:enable Metrics/AbcSize
diff --git a/app/future_controllers/better_together/api_controller.rb b/app/future_controllers/better_together/api_controller.rb
index 9b529eb5c..2c3a3408f 100644
--- a/app/future_controllers/better_together/api_controller.rb
+++ b/app/future_controllers/better_together/api_controller.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'jsonapi/resource_controller'
+require_dependency 'jsonapi/resource_controller'
 
 module BetterTogether
   # Base API controller
diff --git a/app/future_controllers/better_together/bt/api/v1/communities_controller.rb b/app/future_controllers/better_together/bt/api/v1/communities_controller.rb
index 7b43a2a5b..8ae716112 100644
--- a/app/future_controllers/better_together/bt/api/v1/communities_controller.rb
+++ b/app/future_controllers/better_together/bt/api/v1/communities_controller.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'better_together/api_controller'
+require_dependency 'better_together/api_controller'
 
 module BetterTogether
   module Bt
diff --git a/app/future_controllers/better_together/bt/api/v1/community_memberships_controller.rb b/app/future_controllers/better_together/bt/api/v1/community_memberships_controller.rb
index 87718e09a..683be86e6 100644
--- a/app/future_controllers/better_together/bt/api/v1/community_memberships_controller.rb
+++ b/app/future_controllers/better_together/bt/api/v1/community_memberships_controller.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'better_together/api_controller'
+require_dependency 'better_together/api_controller'
 
 module BetterTogether
   module Bt
diff --git a/app/future_controllers/better_together/bt/api/v1/people_controller.rb b/app/future_controllers/better_together/bt/api/v1/people_controller.rb
index f5908d72e..6b14c2e6c 100644
--- a/app/future_controllers/better_together/bt/api/v1/people_controller.rb
+++ b/app/future_controllers/better_together/bt/api/v1/people_controller.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'better_together/api_controller'
+require_dependency 'better_together/api_controller'
 
 module BetterTogether
   module Bt
diff --git a/app/future_controllers/better_together/bt/api/v1/roles_controller.rb b/app/future_controllers/better_together/bt/api/v1/roles_controller.rb
index 0ff0d05e5..589ddcff0 100644
--- a/app/future_controllers/better_together/bt/api/v1/roles_controller.rb
+++ b/app/future_controllers/better_together/bt/api/v1/roles_controller.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'better_together/api_controller'
+require_dependency 'better_together/api_controller'
 
 module BetterTogether
   module Bt
diff --git a/app/helpers/better_together/calendars_helper.rb b/app/helpers/better_together/calendars_helper.rb
index 46bb6bfbf..bf2475d57 100644
--- a/app/helpers/better_together/calendars_helper.rb
+++ b/app/helpers/better_together/calendars_helper.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
-# require 'simple_calendar/calendar_helper'
-
+require_dependency 'simple_calendar/calendar_helper'
 module BetterTogether
   module CalendarsHelper
     include SimpleCalendar::CalendarHelper
diff --git a/app/models/better_together/geography/map.rb b/app/models/better_together/geography/map.rb
index 00aacb41e..d0b9a2383 100644
--- a/app/models/better_together/geography/map.rb
+++ b/app/models/better_together/geography/map.rb
@@ -85,5 +85,5 @@ def to_s
   end
 end
 
-require 'better_together/geography/community_map'
-require 'better_together/geography/community_collection_map'
+require_dependency 'better_together/geography/community_map'
+require_dependency 'better_together/geography/community_collection_map'
diff --git a/app/resources/better_together/api_resource.rb b/app/resources/better_together/api_resource.rb
index b1433e97e..3d27aa4d5 100644
--- a/app/resources/better_together/api_resource.rb
+++ b/app/resources/better_together/api_resource.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# require 'jsonapi/resource'
+require_dependency 'jsonapi/resource'
 
 module BetterTogether
   # Base JSONAPI serializer that sets common attrbutes
diff --git a/app/resources/better_together/bt/api/v1/community_membership_resource.rb b/app/resources/better_together/bt/api/v1/community_membership_resource.rb
index 8f5e6d0b1..d3795a78e 100644
--- a/app/resources/better_together/bt/api/v1/community_membership_resource.rb
+++ b/app/resources/better_together/bt/api/v1/community_membership_resource.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'better_together/api_resource'
+require_dependency 'better_together/api_resource'
 
 module BetterTogether
   module Bt
diff --git a/app/resources/better_together/bt/api/v1/community_resource.rb b/app/resources/better_together/bt/api/v1/community_resource.rb
index d29917ac1..0a50b8499 100644
--- a/app/resources/better_together/bt/api/v1/community_resource.rb
+++ b/app/resources/better_together/bt/api/v1/community_resource.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'better_together/api_resource'
+require_dependency 'better_together/api_resource'
 
 module BetterTogether
   module Bt
diff --git a/app/resources/better_together/bt/api/v1/person_resource.rb b/app/resources/better_together/bt/api/v1/person_resource.rb
index b75034c41..d2e2190ed 100644
--- a/app/resources/better_together/bt/api/v1/person_resource.rb
+++ b/app/resources/better_together/bt/api/v1/person_resource.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'better_together/api_resource'
+require_dependency 'better_together/api_resource'
 
 module BetterTogether
   module Bt
diff --git a/app/resources/better_together/bt/api/v1/registration_resource.rb b/app/resources/better_together/bt/api/v1/registration_resource.rb
index 13e4abccf..2faa230c0 100644
--- a/app/resources/better_together/bt/api/v1/registration_resource.rb
+++ b/app/resources/better_together/bt/api/v1/registration_resource.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'better_together/api_resource'
+require_dependency 'better_together/api_resource'
 
 module BetterTogether
   module Bt
diff --git a/app/resources/better_together/bt/api/v1/role_resource.rb b/app/resources/better_together/bt/api/v1/role_resource.rb
index e65bac423..bf9f33bc5 100644
--- a/app/resources/better_together/bt/api/v1/role_resource.rb
+++ b/app/resources/better_together/bt/api/v1/role_resource.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'better_together/api_resource'
+require_dependency 'better_together/api_resource'
 
 module BetterTogether
   module Bt
diff --git a/app/resources/better_together/bt/api/v1/user_resource.rb b/app/resources/better_together/bt/api/v1/user_resource.rb
index ad5d7d450..3290a17ac 100644
--- a/app/resources/better_together/bt/api/v1/user_resource.rb
+++ b/app/resources/better_together/bt/api/v1/user_resource.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'better_together/api_resource'
+require_dependency 'better_together/api_resource'
 
 module BetterTogether
   module Bt
diff --git a/lib/better_together/engine.rb b/lib/better_together/engine.rb
index 30fe104c4..0344ade23 100644
--- a/lib/better_together/engine.rb
+++ b/lib/better_together/engine.rb
@@ -53,14 +53,14 @@ class Engine < ::Rails::Engine
     end
 
     config.before_initialize do
-      require 'friendly_id'
-      require 'mobility'
-      require 'friendly_id/mobility'
-      require 'jsonapi-resources'
-      require 'importmap-rails'
-      require 'public_activity'
-      require 'pundit'
-      require 'rack/cors'
+      require_dependency 'friendly_id'
+      require_dependency 'mobility'
+      require_dependency 'friendly_id/mobility'
+      require_dependency 'jsonapi-resources'
+      require_dependency 'importmap-rails'
+      require_dependency 'public_activity'
+      require_dependency 'pundit'
+      require_dependency 'rack/cors'
     end
 
     default_url_options = {
@@ -80,13 +80,13 @@ class Engine < ::Rails::Engine
     end
 
     initializer 'better_together.action_mailer' do |app|
-      if Rails.env.production?
-        app.config.action_mailer.show_previews = false
-      else
+      if Rails.env.development?
         app.config.action_mailer.show_previews = true
         app.config.action_mailer.preview_paths =
           app.config.action_mailer.preview_paths.to_a +
           [BetterTogether::Engine.root.join('spec/mailers/previews')]
+      else
+        app.config.action_mailer.show_previews = false
       end
     end
 
diff --git a/spec/dummy/config/initializers/rswag_ui.rb b/spec/dummy/config/initializers/rswag_ui.rb
index 9e105e7b6..1f871c794 100644
--- a/spec/dummy/config/initializers/rswag_ui.rb
+++ b/spec/dummy/config/initializers/rswag_ui.rb
@@ -1,7 +1,7 @@
 # spec/dummy/config/initializers/rswag_ui.rb
 # frozen_string_literal: true
 
-require 'rswag'
+require_dependency 'rswag'
 
 Rswag::Ui.configure do |c|
   # List the Swagger endpoints that you want to be documented through the swagger-ui