diff --git a/app/assets/javascripts/shared/remote_modal.js b/app/assets/javascripts/shared/remote_modal.js
index a6b4091f8..4e9471457 100644
--- a/app/assets/javascripts/shared/remote_modal.js
+++ b/app/assets/javascripts/shared/remote_modal.js
@@ -6,11 +6,14 @@
       ev.stopImmediatePropagation();
       ev.stopPropagation();
       ev.preventDefault();
+
+      animateSpinner();
       $.get(ev.currentTarget.getAttribute('href')).then(function({modal}) {
         $(modal).modal('show')
                 .on("shown.bs.modal", function() {
           $(this).find(".selectpicker").selectpicker();
         });
+        animateSpinner(null, false);
       });
     });
   }
diff --git a/app/models/concerns/permission_checkable_model.rb b/app/models/concerns/permission_checkable_model.rb
index 420dd7e89..125267e28 100644
--- a/app/models/concerns/permission_checkable_model.rb
+++ b/app/models/concerns/permission_checkable_model.rb
@@ -21,7 +21,7 @@ module PermissionCheckableModel
       end
 
     if user_role_permissions.blank? && permission_parent.present?
-      user_role_permissions = permission_parent.load_user_role_permissions(user)
+      user_role_permissions = permission_parent.send :load_user_role_permissions, user
     end
 
     user_role_permissions
diff --git a/app/models/experiment.rb b/app/models/experiment.rb
index 27a5a64bf..e3f090a7d 100644
--- a/app/models/experiment.rb
+++ b/app/models/experiment.rb
@@ -25,9 +25,8 @@ class Experiment < ApplicationRecord
   has_many :activities, inverse_of: :experiment
   has_many :user_assignments, as: :assignable, dependent: :destroy
   has_many :users, through: :user_assignments
-  has_one_attached :workflowimg
 
-  alias_attribute :project, :permission_parent
+  has_one_attached :workflowimg
 
   auto_strip_attributes :name, :description, nullify: false
   validates :name, length: { minimum: Constants::NAME_MIN_LENGTH, maximum: Constants::NAME_MAX_LENGTH }
@@ -239,6 +238,10 @@ class Experiment < ApplicationRecord
     projects - [project]
   end
 
+  def permission_parent
+    project
+  end
+
   private
 
   # Archive all modules. Receives an array of module integer IDs
diff --git a/app/models/my_module.rb b/app/models/my_module.rb
index 6cbeeb1bc..f53e9f83f 100644
--- a/app/models/my_module.rb
+++ b/app/models/my_module.rb
@@ -59,8 +59,6 @@ class MyModule < ApplicationRecord
   # Associations for old activity type
   has_many :activities, inverse_of: :my_module
 
-  alias_attribute :experiment, :permission_parent
-
   default_scope { includes(user_assignments: :user_role) }
 
   scope :overdue, -> { where('my_modules.due_date < ?', Time.current.utc) }
@@ -431,6 +429,10 @@ class MyModule < ApplicationRecord
     task_comments
   end
 
+  def permission_parent
+    experiment
+  end
+
   private
 
   def create_blank_protocol
diff --git a/app/views/projects/show/_experiment_card.html.erb b/app/views/projects/show/_experiment_card.html.erb
index 3ab6e63b9..ae68acd25 100644
--- a/app/views/projects/show/_experiment_card.html.erb
+++ b/app/views/projects/show/_experiment_card.html.erb
@@ -5,7 +5,7 @@
      data-moveable="<%= can_move_experiment?(experiment) %>"
      data-archivable="<%= experiment.active? && can_archive_experiment?(experiment) %>"
      data-restorable="<%= experiment.archived? && can_restore_experiment?(experiment) %>">
->
+
   <div class="checkbox-cell table-cell">
     <div class="sci-checkbox-container">
       <input value="1" type="checkbox" class="sci-checkbox experiment-card-selector">