diff --git a/contentcuration/contentcuration/forms.py b/contentcuration/contentcuration/forms.py
index d9dc781f61..8e9320d85f 100644
--- a/contentcuration/contentcuration/forms.py
+++ b/contentcuration/contentcuration/forms.py
@@ -1,5 +1,4 @@
 import json
-from builtins import object
 
 from django import forms
 from django.conf import settings
@@ -7,6 +6,7 @@
 from django.contrib.auth.forms import UserChangeForm
 from django.contrib.auth.forms import UserCreationForm
 from django.core import signing
+from django.core.exceptions import ValidationError
 from django.db.models import Q
 from django.template.loader import render_to_string
 
@@ -16,23 +16,16 @@
 REGISTRATION_SALT = getattr(settings, 'REGISTRATION_SALT', 'registration')
 
 
-class ExtraFormMixin(object):
-
-    def check_field(self, field, error):
-        if not self.cleaned_data.get(field):
-            self.errors[field] = self.error_class()
-            self.add_error(field, error)
-            return False
-        return self.cleaned_data.get(field)
-
-
 # LOGIN/REGISTRATION FORMS
 #################################################################
-class RegistrationForm(UserCreationForm, ExtraFormMixin):
+class RegistrationForm(UserCreationForm):
+    CODE_ACCOUNT_ACTIVE = 'account_active'
+    CODE_ACCOUNT_INACTIVE = 'account_inactive'
+
     first_name = forms.CharField(required=True)
     last_name = forms.CharField(required=True)
-    email = forms.CharField(required=True)
-    password1 = forms.CharField(required=True)
+    email = forms.EmailField(required=True)
+    password1 = forms.CharField(required=True, min_length=8)
     password2 = forms.CharField(required=True)
     uses = forms.CharField(required=True)
     other_use = forms.CharField(required=False)
@@ -45,22 +38,18 @@ class RegistrationForm(UserCreationForm, ExtraFormMixin):
     locations = forms.CharField(required=True)
 
     def clean_email(self):
-        email = self.cleaned_data['email'].strip().lower()
-        if User.objects.filter(Q(is_active=True) | Q(deleted=True), email__iexact=email).exists():
-            raise UserWarning
+        # ensure email is lower case
+        email = self.cleaned_data["email"].strip().lower()
+        user_qs = User.objects.filter(email__iexact=email)
+        if user_qs.exists():
+            if user_qs.filter(Q(is_active=True) | Q(deleted=True)).exists():
+                raise ValidationError("Account already active", code=self.CODE_ACCOUNT_ACTIVE)
+            else:
+                raise ValidationError("Already registered.", code=self.CODE_ACCOUNT_INACTIVE)
         return email
 
-    def clean(self):
-        super(RegistrationForm, self).clean()
-
-        # Errors should be caught on the frontend
-        # or a warning should be thrown if the account exists
-        self.errors.clear()
-        return self.cleaned_data
-
     def save(self, commit=True):
-        user = super(RegistrationForm, self).save(commit=commit)
-        user.set_password(self.cleaned_data["password1"])
+        user = super(RegistrationForm, self).save(commit=False)
         user.first_name = self.cleaned_data["first_name"]
         user.last_name = self.cleaned_data["last_name"]
         user.information = {
@@ -165,7 +154,7 @@ def save(self, user):
         return user
 
 
-class StorageRequestForm(forms.Form, ExtraFormMixin):
+class StorageRequestForm(forms.Form):
     # Nature of content
     storage = forms.CharField(required=True)
     kind = forms.CharField(required=True)
@@ -194,7 +183,7 @@ class Meta:
                   "audience", "import_count", "location", "uploading_for", "organization_type", "time_constraint", "message")
 
 
-class IssueReportForm(forms.Form, ExtraFormMixin):
+class IssueReportForm(forms.Form):
     operating_system = forms.CharField(required=True)
     browser = forms.CharField(required=True)
     channel = forms.CharField(required=False)
@@ -204,7 +193,7 @@ class Meta:
         fields = ("operating_system", "browser", "channel", "description")
 
 
-class DeleteAccountForm(forms.Form, ExtraFormMixin):
+class DeleteAccountForm(forms.Form):
     email = forms.CharField(required=True)
 
     def __init__(self, user, *args, **kwargs):
@@ -214,5 +203,5 @@ def __init__(self, user, *args, **kwargs):
     def clean_email(self):
         email = self.cleaned_data['email'].strip().lower()
         if self.user.is_admin or self.user.email.lower() != self.cleaned_data['email']:
-            raise UserWarning
+            raise ValidationError("Not allowed")
         return email
diff --git a/contentcuration/contentcuration/frontend/accounts/pages/Create.vue b/contentcuration/contentcuration/frontend/accounts/pages/Create.vue
index ba9f8bf338..e4e28d6d08 100644
--- a/contentcuration/contentcuration/frontend/accounts/pages/Create.vue
+++ b/contentcuration/contentcuration/frontend/accounts/pages/Create.vue
@@ -31,31 +31,40 @@
           v-model="form.first_name"
           maxlength="100"
           counter
-          :label="$tr('firstNameLabel')"
           autofocus
+          :label="$tr('firstNameLabel')"
+          :error-messages="errors.first_name"
+          @input="resetErrors('first_name')"
         />
         <TextField
           v-model="form.last_name"
           maxlength="100"
           counter
           :label="$tr('lastNameLabel')"
+          :error-messages="errors.last_name"
+          @input="resetErrors('last_name')"
         />
         <EmailField
           v-model="form.email"
           maxlength="100"
           counter
           :disabled="Boolean($route.query.email)"
-          :error-messages="emailErrors"
-          @input="emailErrors = []"
+          :error-messages="errors.email"
+          @input="resetErrors('email')"
         />
         <PasswordField
           v-model="form.password1"
+          :additionalRules="passwordValidationRules"
           :label="$tr('passwordLabel')"
+          :error-messages="errors.password1"
+          @input="resetErrors('password1')"
         />
         <PasswordField
           v-model="form.password2"
           :additionalRules="passwordConfirmRules"
           :label="$tr('confirmPasswordLabel')"
+          :error-messages="errors.password2"
+          @input="resetErrors('password2')"
         />
 
         <!-- Usage -->
@@ -200,6 +209,7 @@
   import Checkbox from 'shared/views/form/Checkbox';
   import { policies } from 'shared/constants';
   import DropdownWrapper from 'shared/views/form/DropdownWrapper';
+  import commonStrings from 'shared/translator';
 
   export default {
     name: 'Create',
@@ -219,7 +229,6 @@
       return {
         valid: true,
         registrationFailed: false,
-        emailErrors: [],
         form: {
           first_name: '',
           last_name: '',
@@ -237,6 +246,13 @@
           accepted_policy: false,
           accepted_tos: false,
         },
+        errors: {
+          first_name: [],
+          last_name: [],
+          email: [],
+          password1: [],
+          password2: [],
+        },
       };
     },
     computed: {
@@ -247,6 +263,9 @@
       passwordConfirmRules() {
         return [value => (this.form.password1 === value ? true : this.$tr('passwordMatchMessage'))];
       },
+      passwordValidationRules() {
+        return [value => (value.length >= 8 ? true : this.$tr('passwordValidationMessage'))];
+      },
       acceptedAgreement: {
         get() {
           return this.form.accepted_tos && this.form.accepted_policy;
@@ -294,10 +313,12 @@
         ];
       },
       usageRules() {
-        return [() => (this.form.uses.length ? true : this.$tr('fieldRequiredMessage'))];
+        /* eslint-disable-next-line kolibri/vue-no-undefined-string-uses */
+        return [() => (this.form.uses.length ? true : commonStrings.$tr('fieldRequired'))];
       },
       locationRules() {
-        return [() => (this.form.locations.length ? true : this.$tr('fieldRequiredMessage'))];
+        /* eslint-disable-next-line kolibri/vue-no-undefined-string-uses */
+        return [() => (this.form.locations.length ? true : commonStrings.$tr('fieldRequired'))];
       },
       sources() {
         return sources;
@@ -359,7 +380,8 @@
         ];
       },
       sourceRules() {
-        return [() => (this.form.source.length ? true : this.$tr('fieldRequiredMessage'))];
+        /* eslint-disable-next-line kolibri/vue-no-undefined-string-uses */
+        return [() => (this.form.source.length ? true : commonStrings.$tr('fieldRequired'))];
       },
       clean() {
         return data => {
@@ -413,12 +435,11 @@
     },
     methods: {
       ...mapActions('account', ['register']),
-      ...mapActions('policies', ['openPolicy']),
       showTermsOfService() {
-        this.openPolicy(policies.TERMS_OF_SERVICE);
+        this.$router.push({ query: { showPolicy: policies.TERMS_OF_SERVICE } });
       },
       showPrivacyPolicy() {
-        this.openPolicy(policies.PRIVACY);
+        this.$router.push({ query: { showPolicy: policies.PRIVACY } });
       },
       showStorageField(id) {
         return id === uses.STORING && this.form.uses.includes(id);
@@ -438,8 +459,27 @@
             .catch(error => {
               if (error.message === 'Network Error') {
                 this.$refs.top.scrollIntoView({ behavior: 'smooth' });
+              } else if (error.response.status === 400) {
+                for (const field of error.response.data) {
+                  if (!Object.prototype.hasOwnProperty.call(this.errors, field)) {
+                    continue;
+                  }
+                  let message = '';
+                  switch (field) {
+                    case 'password1':
+                      message = this.$tr('passwordValidationMessage');
+                      break;
+                    default:
+                      /* eslint-disable-next-line kolibri/vue-no-undefined-string-uses */
+                      message = commonStrings.$tr('fieldHasError');
+                      break;
+                  }
+                  this.errors[field] = [message];
+                }
+                this.registrationFailed = true;
+                this.valid = false;
               } else if (error.response.status === 403) {
-                this.emailErrors = [this.$tr('emailExistsMessage')];
+                this.errors.email = [this.$tr('emailExistsMessage')];
               } else if (error.response.status === 405) {
                 this.$router.push({ name: 'AccountNotActivated' });
               } else {
@@ -452,12 +492,14 @@
         }
         return Promise.resolve();
       },
+      resetErrors(field) {
+        this.errors[field] = [];
+      },
     },
 
     $trs: {
       backToLoginButton: 'Sign in',
       createAnAccountTitle: 'Create an account',
-      fieldRequiredMessage: 'Field is required',
       errorsMessage: 'Please fix the errors below',
       registrationFailed: 'There was an error registering your account. Please try again',
       registrationFailedOffline:
@@ -470,6 +512,7 @@
       passwordLabel: 'Password',
       confirmPasswordLabel: 'Confirm password',
       passwordMatchMessage: "Passwords don't match",
+      passwordValidationMessage: 'Password should be at least 8 characters long',
 
       // Usage question
       usageLabel: 'How do you plan on using Kolibri Studio (check all that apply)',
diff --git a/contentcuration/contentcuration/frontend/accounts/pages/Main.vue b/contentcuration/contentcuration/frontend/accounts/pages/Main.vue
index c2ba1f5616..6f305885e3 100644
--- a/contentcuration/contentcuration/frontend/accounts/pages/Main.vue
+++ b/contentcuration/contentcuration/frontend/accounts/pages/Main.vue
@@ -153,12 +153,11 @@
     },
     methods: {
       ...mapActions(['login']),
-      ...mapActions('policies', ['openPolicy']),
       showTermsOfService() {
-        this.openPolicy(policies.TERMS_OF_SERVICE);
+        this.$router.push({ query: { showPolicy: policies.TERMS_OF_SERVICE } });
       },
       showPrivacyPolicy() {
-        this.openPolicy(policies.PRIVACY);
+        this.$router.push({ query: { showPolicy: policies.PRIVACY } });
       },
       submit() {
         if (this.$refs.form.validate()) {
diff --git a/contentcuration/contentcuration/frontend/accounts/pages/__tests__/create.spec.js b/contentcuration/contentcuration/frontend/accounts/pages/__tests__/create.spec.js
index f2a201b560..143520329b 100644
--- a/contentcuration/contentcuration/frontend/accounts/pages/__tests__/create.spec.js
+++ b/contentcuration/contentcuration/frontend/accounts/pages/__tests__/create.spec.js
@@ -17,8 +17,8 @@ const defaultData = {
   first_name: 'Test',
   last_name: 'User',
   email: 'test@test.com',
-  password1: 'pass',
-  password2: 'pass',
+  password1: 'tester123',
+  password2: 'tester123',
   uses: ['tagging'],
   storage: '',
   other_use: '',
@@ -126,6 +126,11 @@ describe('create', () => {
         expect(register).not.toHaveBeenCalled();
       });
     });
+    it('should fail if password1 is too short', () => {
+      const wrapper = makeWrapper({ password1: '123' });
+      wrapper.vm.submit();
+      expect(register).not.toHaveBeenCalled();
+    });
     it('should fail if password1 and password2 do not match', () => {
       const wrapper = makeWrapper({ password1: 'some other password' });
       wrapper.vm.submit();
@@ -155,7 +160,7 @@ describe('create', () => {
     it('should say account with email already exists if register returns a 403', async () => {
       wrapper.setMethods({ register: makeFailedPromise(403) });
       await wrapper.vm.submit();
-      expect(wrapper.vm.emailErrors).toHaveLength(1);
+      expect(wrapper.vm.errors.email).toHaveLength(1);
     });
     it('should say account has not been activated if register returns 405', async () => {
       wrapper.setMethods({ register: makeFailedPromise(405) });
diff --git a/contentcuration/contentcuration/frontend/accounts/pages/__tests__/resetPassword.spec.js b/contentcuration/contentcuration/frontend/accounts/pages/__tests__/resetPassword.spec.js
index 7980086963..6d6e9a2451 100644
--- a/contentcuration/contentcuration/frontend/accounts/pages/__tests__/resetPassword.spec.js
+++ b/contentcuration/contentcuration/frontend/accounts/pages/__tests__/resetPassword.spec.js
@@ -39,8 +39,10 @@ describe('resetPassword', () => {
   });
   it('should call setPassword on submit if password data is valid', () => {
     wrapper.setData({ new_password1: 'pass', new_password2: 'pass' });
-    wrapper.find({ ref: 'form' }).trigger('submit');
-    expect(setPassword).toHaveBeenCalled();
+    wrapper.vm.$nextTick(() => {
+      wrapper.find({ ref: 'form' }).trigger('submit');
+      expect(setPassword).toHaveBeenCalled();
+    });
   });
   it('should retain data from query params so reset credentials are preserved', () => {
     router.replace({
@@ -50,7 +52,9 @@ describe('resetPassword', () => {
       },
     });
     wrapper.setData({ new_password1: 'pass', new_password2: 'pass' });
-    wrapper.find({ ref: 'form' }).trigger('submit');
-    expect(setPassword.mock.calls[0][0].test).toBe('testing');
+    wrapper.vm.$nextTick(() => {
+      wrapper.find({ ref: 'form' }).trigger('submit');
+      expect(setPassword.mock.calls[0][0].test).toBe('testing');
+    });
   });
 });
diff --git a/contentcuration/contentcuration/frontend/accounts/pages/resetPassword/ResetPassword.vue b/contentcuration/contentcuration/frontend/accounts/pages/resetPassword/ResetPassword.vue
index 2fd3ceddd3..65e69270c9 100644
--- a/contentcuration/contentcuration/frontend/accounts/pages/resetPassword/ResetPassword.vue
+++ b/contentcuration/contentcuration/frontend/accounts/pages/resetPassword/ResetPassword.vue
@@ -9,6 +9,7 @@
       <PasswordField
         v-model="new_password1"
         :label="$tr('passwordLabel')"
+        :additionalRules="passwordValidationRules"
         autofocus
       />
       <PasswordField
@@ -52,6 +53,9 @@
       passwordConfirmRules() {
         return [value => (this.new_password1 === value ? true : this.$tr('passwordMatchMessage'))];
       },
+      passwordValidationRules() {
+        return [value => (value.length >= 8 ? true : this.$tr('passwordValidationMessage'))];
+      },
     },
     methods: {
       ...mapActions('account', ['setPassword']),
@@ -80,6 +84,7 @@
       resetPasswordPrompt: 'Enter and confirm your new password',
       passwordLabel: 'New password',
       passwordConfirmLabel: 'Confirm password',
+      passwordValidationMessage: 'Password should be at least 8 characters long',
       passwordMatchMessage: "Passwords don't match",
       submitButton: 'Submit',
       resetPasswordFailed: 'Failed to reset password. Please try again.',
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/ContentNode.vue b/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/ContentNode.vue
index aa739233fa..359233cec9 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/ContentNode.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/ContentNode.vue
@@ -55,7 +55,7 @@
                       </VListTileContent>
                       <VListTileAction style="min-width: unset;" class="pl-3 pr-1">
                         <div class="badge caption font-weight-bold">
-                          {{ contentNode.resource_count }}
+                          {{ contentNodeResourceCount }}
                         </div>
                       </VListTileAction>
                       <!-- Custom placement of dropdown indicator -->
@@ -117,7 +117,7 @@
 </template>
 <script>
 
-  import { mapActions, mapGetters } from 'vuex';
+  import { mapActions, mapGetters, mapState } from 'vuex';
   import clipboardMixin, { parentMixin } from './mixins';
   import ContentNodeOptions from './ContentNodeOptions';
   import Checkbox from 'shared/views/form/Checkbox';
@@ -150,6 +150,7 @@
       };
     },
     computed: {
+      ...mapState('clipboard', ['clipboardNodesMap']),
       ...mapGetters('clipboard', ['isPreloading', 'isLoaded']),
       thumbnailAttrs() {
         if (this.contentNode) {
@@ -181,6 +182,10 @@
         const contentNode = this.contentNode || {};
         return { ...contentNode, clipboardNodeId: this.nodeId };
       },
+      contentNodeResourceCount() {
+        return Object.values(this.clipboardNodesMap).filter(node => node.parent === this.nodeId)
+          .length;
+      },
     },
     watch: {
       open(open) {
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/ContentNodeOptions.vue b/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/ContentNodeOptions.vue
index b8aaf5380f..4256eb0e5b 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/ContentNodeOptions.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/ContentNodeOptions.vue
@@ -9,7 +9,13 @@
     </VListTile>
     <VListTile v-if="allowMove" @click.stop="calculateMoveNodes">
       <VListTileTitle>{{ $tr('moveTo') }}</VListTileTitle>
-      <MoveModal v-if="moveModalOpen" ref="moveModal" v-model="moveModalOpen" @target="moveNodes" />
+      <MoveModal 
+        v-if="moveModalOpen" 
+        ref="moveModal" 
+        v-model="moveModalOpen" 
+        :clipboardTopicResourceCount="topicAndResourceCount"
+        @target="moveNodes" 
+      />
     </VListTile>
     <VListTile @click="removeNode()">
       <VListTileTitle>{{ $tr('remove') }}</VListTileTitle>
@@ -20,7 +26,7 @@
 
 <script>
 
-  import { mapActions, mapGetters } from 'vuex';
+  import { mapActions, mapGetters, mapState } from 'vuex';
   import { RouteNames } from '../../constants';
   import MoveModal from '../move/MoveModal';
   import clipboardMixin from './mixins';
@@ -40,6 +46,7 @@
       };
     },
     computed: {
+      ...mapState('clipboard', ['clipboardNodesMap']),
       ...mapGetters('clipboard', ['getMoveTrees', 'isLegacyNode']),
       isLegacy() {
         return this.isLegacyNode(this.nodeId);
@@ -60,6 +67,19 @@
         });
         return `${channelURI}${sourceNode.href}`;
       },
+      topicAndResourceCount() {
+        let topicCount = 0;
+        let resourceCount = 0;
+        if (this.contentNode.kind === 'topic') {
+          topicCount = 1;
+          resourceCount = Object.values(this.clipboardNodesMap).filter(
+            node => node.parent === this.nodeId
+          ).length;
+        } else {
+          resourceCount = 1;
+        }
+        return { topicCount: topicCount, resourceCount: resourceCount };
+      },
     },
     methods: {
       ...mapActions(['showSnackbar']),
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/index.vue b/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/index.vue
index d9f54bee8d..b5bcfa8db7 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/index.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/index.vue
@@ -72,6 +72,8 @@
                         v-if="allowMove && moveModalOpen"
                         ref="moveModal"
                         v-model="moveModalOpen"
+                        :moveNodeIds="selectedNodeIds"
+                        :clipboardTopicResourceCount="topicAndResourceCount"
                         @target="moveNodes"
                       />
                       <KIconButton
@@ -201,7 +203,7 @@
     },
     computed: {
       ...mapGetters(['clipboardRootId']),
-      ...mapState('clipboard', ['initializing']),
+      ...mapState('clipboard', ['initializing', 'clipboardNodesMap']),
       ...mapGetters('clipboard', [
         'channels',
         'selectedNodeIds',
@@ -245,6 +247,21 @@
           ? DropEffect.COPY
           : DropEffect.NONE;
       },
+      topicAndResourceCount() {
+        let topicCount = 0;
+        let resourceCount = 0;
+        this.selectedNodeIds.forEach(id => {
+          const kind = this.clipboardNodesMap[id]?.kind;
+          if (kind === 'topic' || !kind) {
+            // Increment topicCount if kind is "topic" or not set
+            topicCount++;
+          } else {
+            // Increment resourceCount for any other kind
+            resourceCount++;
+          }
+        });
+        return { topicCount: topicCount, resourceCount: resourceCount };
+      },
     },
     watch: {
       open(open) {
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeContextMenu.vue b/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeContextMenu.vue
index e85d192285..ea742b88eb 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeContextMenu.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeContextMenu.vue
@@ -2,7 +2,7 @@
 
   <Menu v-model="value" :position-x="positionX" :position-y="positionY" absolute>
     <VCard>
-      <slot>
+      <slot v-if="value">
         <ContentNodeOptions :nodeId="nodeId" :hideDetailsLink="hideDetailsLink" />
       </slot>
     </VCard>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeEditListItem.vue b/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeEditListItem.vue
index 3d522896fb..aff8a25764 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeEditListItem.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeEditListItem.vue
@@ -45,6 +45,18 @@
         </template>
 
         <template #actions-end>
+          <VListTileAction class="action-icon px-1" @click.stop>
+            <transition name="fade">
+              <KIconButton
+                icon="rename"
+                size="small"
+                :tooltip="$tr('editTooltip')"
+                :ariaLabel="$tr('editTooltip')"
+                :disabled="copying"
+                @click.stop="editTitleDescription()"
+              />
+            </transition>
+          </VListTileAction>
           <VListTileAction :aria-hidden="!active" class="action-icon px-1">
             <Menu v-model="activated">
               <template #activator="{ on }">
@@ -58,7 +70,7 @@
                   @click.stop
                 />
               </template>
-              <ContentNodeOptions v-if="!copying" :nodeId="nodeId" />
+              <ContentNodeOptions v-if="!copying && activated" :nodeId="nodeId" />
             </Menu>
           </VListTileAction>
         </template>
@@ -106,7 +118,7 @@
   import DraggableItem from 'shared/views/draggable/DraggableItem';
   import { ContentNode } from 'shared/data/resources';
   import { DragEffect, DropEffect, EffectAllowed } from 'shared/mixins/draggable/constants';
-  import { DraggableRegions } from 'frontend/channelEdit/constants';
+  import { QuickEditModals, DraggableRegions } from 'frontend/channelEdit/constants';
   import { withChangeTracker } from 'shared/data/changes';
   import { COPYING_STATUS, COPYING_STATUS_VALUES } from 'shared/data/constants';
 
@@ -235,7 +247,14 @@
         'updateContentNode',
         'waitForCopyingStatus',
         'deleteContentNode',
+        'setQuickEditModal',
       ]),
+      editTitleDescription() {
+        this.setQuickEditModal({
+          modal: QuickEditModals.TITLE_DESCRIPTION,
+          nodeIds: [this.nodeId],
+        });
+      },
       retryFailedCopy: withChangeTracker(function(changeTracker) {
         this.updateContentNode({
           id: this.nodeId,
@@ -280,6 +299,7 @@
       creatingCopies: 'Copying...',
       copiedSnackbar: 'Copy operation complete',
       undo: 'Undo',
+      editTooltip: 'Edit Title & Description',
     },
   };
 
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeOptions.vue b/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeOptions.vue
index 32579e9f68..eeca5937eb 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeOptions.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeOptions.vue
@@ -1,44 +1,50 @@
 <template>
 
-  <VList>
-    <VListTile v-if="isTopic && canEdit" @click="newTopicNode">
-      <VListTileTitle>{{ $tr('newSubtopic') }}</VListTileTitle>
-    </VListTile>
-    <VListTile v-if="canEdit && !hideEditLink" :to="editLink" @click="trackAction('Edit')">
-      <VListTileTitle>
-        {{ isTopic ? $tr('editTopicDetails') : $tr('editDetails') }}
-      </VListTileTitle>
-    </VListTile>
-    <VListTile v-if="!hideDetailsLink" :to="viewLink" @click="trackAction('View')">
-      <VListTileTitle>{{ $tr('viewDetails') }}</VListTileTitle>
-    </VListTile>
-    <VListTile v-if="canEdit" @click.stop="moveModalOpen = true">
-      <VListTileTitle>{{ $tr('move') }}</VListTileTitle>
-      <MoveModal
-        v-if="moveModalOpen"
-        ref="moveModal"
-        v-model="moveModalOpen"
-        :moveNodeIds="[nodeId]"
-        @target="moveNode"
-      />
-    </VListTile>
-    <VListTile v-if="canEdit" @click="duplicateNode()">
-      <VListTileTitle>{{ $tr('makeACopy') }}</VListTileTitle>
-    </VListTile>
-    <VListTile @click="copyToClipboard()">
-      <VListTileTitle>{{ $tr('copyToClipboard') }}</VListTileTitle>
-    </VListTile>
-    <VListTile v-if="canEdit" @click="removeNode()">
-      <VListTileTitle>{{ $tr('remove') }}</VListTileTitle>
-    </VListTile>
-  </VList>
+  <div
+    style="max-height: 80vh"
+  >
+    <VList ref="optionsList">
+      <template
+        v-for="(group, groupIndex) in groupedOptions"
+      >
+        <VListTile
+          v-for="(option, index) in group"
+          :key="groupIndex + '-' + index"
+          class="options-list-item"
+          ripple
+          :to="option.to"
+          tabindex="0"
+          @click="option.onClick($event)"
+          @keydown.enter="option.onClick($event)"
+          @keydown.tab="checkTabBoundaries($event)"
+        >
+          <VListTileTitle>
+            {{ option.label }}
+          </VListTileTitle>
+        </VListTile>
+        <VDivider
+          v-if="groupIndex < groupedOptions.length - 1"
+          :key="groupIndex + '-divider'"
+          class="divider"
+        />
+      </template>
+    </VList>
+
+    <MoveModal
+      v-if="moveModalOpen"
+      ref="moveModal"
+      v-model="moveModalOpen"
+      :moveNodeIds="[nodeId]"
+      @target="moveNode"
+    />
+  </div>
 
 </template>
 
 <script>
 
   import { mapActions, mapGetters } from 'vuex';
-  import { RouteNames, TabNames } from '../constants';
+  import { RouteNames, TabNames, QuickEditModals } from '../constants';
   import MoveModal from './move/MoveModal';
   import { withChangeTracker } from 'shared/data/changes';
   import { RELATIVE_TREE_POSITIONS } from 'shared/data/constants';
@@ -76,6 +82,121 @@
       isTopic() {
         return this.node.kind === 'topic';
       },
+      /**
+       * Returns a list of options to display in the menu
+       * @returns {Array<Array<Object>>} List of lists, where each inner list is a group of options
+       *                                 already filtered by the render condition
+       */
+      groupedOptions() {
+        const options = [
+          [
+            {
+              label: this.$tr('viewDetails'),
+              to: this.viewLink,
+              onClick: () => this.trackAction('View'),
+              condition: !this.hideDetailsLink,
+            },
+            {
+              label: this.$tr('editTitleDescription'),
+              onClick: this.quickEditModalFactory(QuickEditModals.TITLE_DESCRIPTION),
+              condition: this.canEdit,
+            },
+          ],
+          [
+            {
+              label: this.$tr('editAllDetails'),
+              to: this.editLink,
+              onClick: () => this.trackAction('Edit'),
+              condition: this.canEdit && !this.hideEditLink,
+            },
+            {
+              label: this.$tr('move'),
+              onClick: $event => {
+                $event.stopPropagation();
+                this.moveModalOpen = true;
+              },
+              condition: this.canEdit,
+            },
+            {
+              label: this.$tr('copyToClipboard'),
+              onClick: this.copyToClipboard,
+              condition: true,
+            },
+            {
+              label: this.$tr('makeACopy'),
+              onClick: this.duplicateNode,
+              condition: this.canEdit,
+            },
+            {
+              label: this.$tr('newSubtopic'),
+              onClick: this.newTopicNode,
+              condition: this.canEdit && this.isTopic,
+            },
+            {
+              label: this.$tr('remove'),
+              onClick: () => this.removeNode([this.nodeId]),
+              condition: this.canEdit,
+            },
+          ],
+          [
+            {
+              label: this.$tr('editTags'),
+              onClick: this.quickEditModalFactory(QuickEditModals.TAGS),
+              condition: this.canEdit && false,
+            },
+            {
+              label: this.$tr('editLanguage'),
+              onClick: this.quickEditModalFactory(QuickEditModals.LANGUAGE),
+              condition: this.canEdit,
+            },
+          ],
+          [
+            {
+              label: this.$tr('editCategories'),
+              onClick: this.quickEditModalFactory(QuickEditModals.CATEGORIES),
+              condition: this.canEdit,
+            },
+            {
+              label: this.$tr('editLevels'),
+              onClick: this.quickEditModalFactory(QuickEditModals.LEVELS),
+              condition: this.canEdit,
+            },
+            {
+              label: this.$tr('editLearningActivities'),
+              onClick: this.quickEditModalFactory(QuickEditModals.LEARNING_ACTIVITIES),
+              condition: this.canEdit && !this.isTopic,
+            },
+          ],
+          [
+            {
+              label: this.$tr('editSource'),
+              onClick: this.quickEditModalFactory(QuickEditModals.SOURCE),
+              condition: this.canEdit && !this.isTopic,
+            },
+            {
+              label: this.$tr('editAudience'),
+              onClick: this.quickEditModalFactory(QuickEditModals.AUDIENCE),
+              condition: this.canEdit && !this.isTopic,
+            },
+          ],
+          [
+            {
+              label: this.$tr('editCompletion'),
+              onClick: this.quickEditModalFactory(QuickEditModals.COMPLETION),
+              condition: this.canEdit && !this.isTopic,
+            },
+            {
+              label: this.$tr('editWhatIsNeeded'),
+              onClick: this.quickEditModalFactory(QuickEditModals.WHAT_IS_NEEDED),
+              condition: this.canEdit,
+            },
+          ],
+        ];
+
+        return options
+          .filter(group => group.some(option => option.condition))
+          .map(group => group.filter(option => option.condition));
+      },
       editLink() {
         return {
           name: RouteNames.CONTENTNODE_DETAILS,
@@ -102,6 +223,15 @@
         }
       },
     },
+    beforeMount() {
+      this.lastFocus = document.activeElement;
+    },
+    mounted() {
+      this.focusFirstOption();
+    },
+    destroyed() {
+      this.lastFocus && this.lastFocus.focus();
+    },
     methods: {
       ...mapActions(['showSnackbar', 'clearSnackbar']),
       ...mapActions('contentNode', [
@@ -109,8 +239,31 @@
         'moveContentNodes',
         'copyContentNode',
         'waitForCopyingStatus',
+        'setQuickEditModal',
       ]),
       ...mapActions('clipboard', ['copy']),
+      async focusFirstOption() {
+        const { optionsList } = this.$refs;
+        const firstOption = optionsList.$el.querySelector('a');
+        let tries = 0;
+        while (document.activeElement !== firstOption && tries++ < 20) {
+          await new Promise(resolve => setTimeout(resolve, 0));
+          firstOption.focus();
+        }
+      },
+      checkTabBoundaries($event) {
+        const optionsList = this.$refs.optionsList;
+        const options = optionsList.$el.querySelectorAll('a');
+        const index = Array.from(options).indexOf($event.target);
+        if (
+          (index === 0 && $event.shiftKey) ||
+          (index === options.length - 1 && !$event.shiftKey)
+        ) {
+          // destroy component
+          $event.preventDefault();
+          this.$destroy();
+        }
+      },
       newTopicNode() {
         this.trackAction('New topic');
         const nodeData = {
@@ -155,10 +308,21 @@
         // Otherwise, don't do anything
         return () => {};
       },
-      removeNode: withChangeTracker(function(changeTracker) {
+      quickEditModalFactory(modal) {
+        return $event => {
+          $event.preventDefault();
+          this.setQuickEditModal({
+            modal,
+            nodeIds: [this.nodeId],
+          });
+          const trackActionLabel = modal.replace(/_/g, ' ').toLowerCase();
+          this.trackAction(`Edit ${trackActionLabel}`);
+        };
+      },
+      removeNode: withChangeTracker(function(id__in, changeTracker) {
         this.trackAction('Delete');
         const redirect = this.getRemoveNodeRedirect();
-        return this.moveContentNodes({ id__in: [this.nodeId], parent: this.trashId }).then(() => {
+        return this.moveContentNodes({ id__in, parent: this.trashId }).then(() => {
           redirect();
           this.showSnackbar({
             text: this.$tr('removedItems'),
@@ -222,8 +386,17 @@
 
     $trs: {
       newSubtopic: 'New folder',
-      editTopicDetails: 'Edit folder details',
-      editDetails: 'Edit details',
+      editTitleDescription: 'Edit title and description',
+      editAllDetails: 'Edit all details',
+      editTags: 'Edit tags',
+      editLanguage: 'Edit language',
+      editCategories: 'Edit categories',
+      editLevels: 'Edit levels',
+      editLearningActivities: 'Edit learning activities',
+      editSource: 'Edit source',
+      editAudience: 'Edit audience',
+      editCompletion: 'Edit completion',
+      editWhatIsNeeded: "Edit 'what is needed'",
       viewDetails: 'View details',
       move: 'Move',
       makeACopy: 'Make a copy',
@@ -240,5 +413,7 @@
 </script>
 
 <style scoped>
-
+  .divider {
+    margin: 8px 0!important;
+  }
 </style>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditAudienceModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditAudienceModal.vue
new file mode 100644
index 0000000000..87a7f368b5
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditAudienceModal.vue
@@ -0,0 +1,170 @@
+<template>
+
+  <KModal
+    :title="$tr('editAudienceTitle')"
+    :submitText="$tr('saveAction')"
+    :cancelText="$tr('cancelAction')"
+    data-test="edit-audience-modal"
+    @submit="handleSave"
+    @cancel="close"
+  >
+    <p v-if="resourcesSelectedText.length > 0" data-test="resources-selected-message">
+      {{ resourcesSelectedText }}
+    </p>
+    <template v-if="isMultipleAudience">
+      <p data-test="multiple-audience-message">
+        {{ $tr('multipleAudience') }}
+      </p>
+      <Divider />
+
+    </template>
+    <h4 class="modal-subheading">
+      {{ $tr('visibleTo') }}
+    </h4>
+    <div
+      data-test="roles-options-list"
+    >
+      <KRadioButton
+        v-for="rol in rolesOptions"
+        :key="rol.value"
+        v-model="selectedRol"
+        data-test="rol-radio-button"
+        :label="rol.label"
+        :value="rol.value"
+        :description="rol.description"
+      />
+    </div>
+    <Divider />
+
+    <KCheckbox
+      :checked="forBeginners"
+      data-test="for-beginners-checkbox"
+      :label="$tr('forBeginnersCheckbox')"
+      @change="value => forBeginners = value"
+    />
+  </KModal>
+
+</template>
+
+
+<script>
+
+  import { mapGetters, mapActions } from 'vuex';
+  import { RolesList, RolesNames } from 'shared/leUtils/Roles';
+  import { ResourcesNeededTypes } from 'shared/constants';
+  import { constantsTranslationMixin } from 'shared/mixins';
+  import { hasMultipleFieldValues } from 'shared/utils/helpers';
+  import commonStrings from 'shared/translator';
+
+  export default {
+    name: 'EditAudienceModal',
+    mixins: [constantsTranslationMixin],
+    props: {
+      nodeIds: {
+        type: Array,
+        required: true,
+      },
+      resourcesSelectedText: {
+        type: String,
+        default: '',
+      },
+    },
+    data() {
+      return {
+        selectedRol: '',
+        forBeginners: false,
+      };
+    },
+    computed: {
+      ...mapGetters('contentNode', ['getContentNodes']),
+      nodes() {
+        return this.getContentNodes(this.nodeIds);
+      },
+      rolesOptions() {
+        return RolesList.map(role => ({
+          value: role,
+          label: this.translateConstant(role),
+          description: this.rolesDescription[role],
+        }));
+      },
+      rolesDescription() {
+        return {
+          [RolesNames.COACH]: this.$tr('visibleToCoaches'),
+          [RolesNames.LEARNER]: this.$tr('visibleToAnyone'),
+        };
+      },
+      hasMultipleRoleVisibilities() {
+        return hasMultipleFieldValues(this.nodes, 'role_visibility');
+      },
+      hasMultipleForBeginnersValues() {
+        let accValue = null;
+        for (const node of this.nodes) {
+          const value = Boolean(
+            node.learner_needs && node.learner_needs[ResourcesNeededTypes.FOR_BEGINNERS]
+          );
+          if (accValue === null) {
+            accValue = value;
+          } else if (accValue !== value) {
+            return true;
+          }
+        }
+        return false;
+      },
+      isMultipleAudience() {
+        return this.hasMultipleRoleVisibilities || this.hasMultipleForBeginnersValues;
+      },
+    },
+    created() {
+      const roles = [...new Set(this.nodes.map(node => node.role_visibility))];
+      if (roles.length === 1) {
+        this.selectedRol = roles[0] || '';
+      }
+      this.forBeginners = this.nodes.every(node => {
+        return node.learner_needs && node.learner_needs[ResourcesNeededTypes.FOR_BEGINNERS];
+      });
+    },
+    methods: {
+      ...mapActions('contentNode', ['updateContentNode']),
+      close() {
+        this.$emit('close');
+      },
+      async handleSave() {
+        await Promise.all(
+          this.nodes.map(node => {
+            const learnerNeeds = {
+              ...node.learner_needs,
+              [ResourcesNeededTypes.FOR_BEGINNERS]: this.forBeginners || null,
+            };
+            return this.updateContentNode({
+              id: node.id,
+              learner_needs: learnerNeeds,
+              role_visibility: this.selectedRol || null,
+            });
+          })
+        );
+        /* eslint-disable-next-line kolibri/vue-no-undefined-string-uses */
+        this.$store.dispatch('showSnackbarSimple', commonStrings.$tr('changesSaved'));
+        this.close();
+      },
+    },
+    $trs: {
+      editAudienceTitle: 'Edit Audience',
+      saveAction: 'Save',
+      cancelAction: 'Cancel',
+      forBeginnersCheckbox: 'For beginners',
+      visibleTo: 'Visible to:',
+      visibleToAnyone: 'Resources are visible to anyone',
+      visibleToCoaches:
+        'Resources are visible only to coaches (teachers, facilitators, administrators)',
+      multipleAudience:
+        'The selected resources have a mixed audience visbility. Choosing from the options below will apply the changes to all the selected resources',
+    },
+  };
+
+</script>
+
+<style scoped>
+  .modal-subheading {
+    margin-bottom: 12px;
+  }
+</style>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditBooleanMapModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditBooleanMapModal.vue
new file mode 100644
index 0000000000..8168d8a72d
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditBooleanMapModal.vue
@@ -0,0 +1,180 @@
+<template>
+
+  <KModal
+    :title="title"
+    :submitText="$tr('saveAction')"
+    :cancelText="$tr('cancelAction')"
+    data-test="edit-booleanMap-modal"
+    @submit="handleSave"
+    @cancel="close"
+  >
+    <p v-if="resourcesSelectedText.length > 0" data-test="resources-selected-message">
+      {{ resourcesSelectedText }}
+    </p>
+    <template v-if="isDescendantsUpdatable && isTopicSelected">
+      <KCheckbox
+        :checked="updateDescendants"
+        data-test="update-descendants-checkbox"
+        :label="$tr('updateDescendantsCheckbox')"
+        @change="(value) => { updateDescendants = value }"
+      />
+      <Divider />
+    </template>
+    <slot
+      name="input"
+      :value="selectedValues"
+      :inputHandler="(value) => { selectedValues = value }"
+    ></slot>
+
+    <span v-if="error" class="red--text">
+      {{ error }}
+    </span>
+  </KModal>
+
+</template>
+
+
+<script>
+
+  /**
+   * EditBooleanMapModal
+   * This component is a modal responsible for reusing the logic of saving
+   * the edition of a boolean map field for multiple nodes.
+   */
+  import { mapGetters, mapActions } from 'vuex';
+  import { ContentKindsNames } from 'shared/leUtils/ContentKinds';
+  import { getInvalidText } from 'shared/utils/validation';
+
+  export default {
+    name: 'EditBooleanMapModal',
+    props: {
+      nodeIds: {
+        type: Array,
+        required: true,
+      },
+      field: {
+        type: String,
+        required: true,
+      },
+      title: {
+        type: String,
+        required: true,
+      },
+      isDescendantsUpdatable: {
+        type: Boolean,
+        default: false,
+      },
+      confirmationMessage: {
+        type: String,
+        required: true,
+      },
+      validators: {
+        type: Array,
+        default: () => [],
+      },
+      resourcesSelectedText: {
+        type: String,
+        default: '',
+      },
+    },
+    data() {
+      return {
+        updateDescendants: false,
+        error: '',
+        /**
+         * selectedValues is an object with the following structure:
+         * {
+         *  [optionId]: [nodeId1, nodeId2, ...]
+         * }
+         * Where nodeIds is the id of the nodes that have the option selected
+         */
+        selectedValues: {},
+      };
+    },
+    computed: {
+      ...mapGetters('contentNode', ['getContentNodes']),
+      nodes() {
+        return this.getContentNodes(this.nodeIds);
+      },
+      isTopicSelected() {
+        return this.nodes.some(node => node.kind === ContentKindsNames.TOPIC);
+      },
+    },
+    watch: {
+      selectedValues() {
+        this.validate();
+      },
+    },
+    created() {
+      const optionsNodes = {};
+
+      this.nodes.forEach(node => {
+        Object.entries(node[this.field] || {})
+          .filter(entry => entry[1] === true)
+          .forEach(([optionId]) => {
+            optionsNodes[optionId] = optionsNodes[optionId] || [];
+            optionsNodes[optionId].push(node.id);
+          });
+      });
+
+      this.selectedValues = optionsNodes;
+    },
+    methods: {
+      ...mapActions('contentNode', ['updateContentNode', 'updateContentNodeDescendants']),
+      close() {
+        this.$emit('close');
+      },
+      validate() {
+        if (this.validators && this.validators.length) {
+          this.error = getInvalidText(
+            this.validators,
+            Object.keys(this.selectedValues).filter(
+              key => this.selectedValues[key].length === this.nodes.length
+            )
+          );
+        } else {
+          this.error = '';
+        }
+      },
+      async handleSave() {
+        this.validate();
+        if (this.error) {
+          return;
+        }
+
+        await Promise.all(
+          this.nodes.map(node => {
+            const fieldValue = {};
+            Object.entries(this.selectedValues).forEach(([key, value]) => {
+              if (value.includes(node.id)) {
+                fieldValue[key] = true;
+              }
+            });
+            if (this.updateDescendants && node.kind === ContentKindsNames.TOPIC) {
+              return this.updateContentNodeDescendants({
+                id: node.id,
+                [this.field]: fieldValue,
+              });
+            }
+            return this.updateContentNode({
+              id: node.id,
+              [this.field]: fieldValue,
+            });
+          })
+        );
+        this.$store.dispatch('showSnackbarSimple', this.confirmationMessage || '');
+        this.close();
+      },
+    },
+    $trs: {
+      saveAction: 'Save',
+      cancelAction: 'Cancel',
+      updateDescendantsCheckbox:
+        'Apply to all resources and folders nested within the selected folders',
+    },
+  };
+
+</script>
+
+<style scoped>
+</style>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditCategoriesModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditCategoriesModal.vue
new file mode 100644
index 0000000000..014709c5b2
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditCategoriesModal.vue
@@ -0,0 +1,62 @@
+<template>
+
+  <EditBooleanMapModal
+    field="categories"
+    isDescendantsUpdatable
+    :title="$tr('editCategories')"
+    :nodeIds="nodeIds"
+    :confirmationMessage="changesSaved"
+    :resourcesSelectedText="resourcesSelectedText"
+    @close="() => $emit('close')"
+  >
+    <template #input="{ value, inputHandler }">
+      <CategoryOptions
+        expanded
+        hideLabel
+        :value="value"
+        :nodeIds="nodeIds"
+        @input="inputHandler"
+      />
+    </template>
+  </EditBooleanMapModal>
+
+</template>
+
+
+<script>
+
+  import EditBooleanMapModal from './EditBooleanMapModal.vue';
+  import CategoryOptions from 'shared/views/contentNodeFields/CategoryOptions';
+  import commonStrings from 'shared/translator';
+
+  export default {
+    name: 'EditCategoriesModal',
+    components: {
+      CategoryOptions,
+      EditBooleanMapModal,
+    },
+    props: {
+      nodeIds: {
+        type: Array,
+        required: true,
+      },
+      resourcesSelectedText: {
+        type: String,
+        default: '',
+      },
+    },
+    computed: {
+      changesSaved() {
+        /* eslint-disable-next-line kolibri/vue-no-undefined-string-uses */
+        return commonStrings.$tr('changesSaved');
+      },
+    },
+    $trs: {
+      editCategories: 'Edit Categories',
+    },
+  };
+
+</script>
+
+<style scoped>
+</style>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditCompletionModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditCompletionModal.vue
new file mode 100644
index 0000000000..c1f920d2d9
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditCompletionModal.vue
@@ -0,0 +1,142 @@
+<template>
+
+  <KModal
+    :title="$tr('editCompletion')"
+    :submitText="$tr('saveAction')"
+    :cancelText="$tr('cancelAction')"
+    data-test="edit-completion-modal"
+    @submit="handleSave"
+    @cancel="close"
+  >
+    <CompletionOptions
+      ref="completionOptions"
+      v-model="completionAndDuration"
+      required
+      expanded
+      :maxMenuHeight="150"
+      :kind="contentNode.kind"
+      :fileDuration="fileDuration"
+    />
+  </KModal>
+
+</template>
+
+<script>
+
+  import { mapGetters, mapActions } from 'vuex';
+  import { getFileDuration } from 'shared/utils/helpers';
+  import CompletionOptions from 'shared/views/contentNodeFields/CompletionOptions';
+  import commonStrings from 'shared/translator';
+
+  export default {
+    name: 'EditCompletionModal',
+    components: {
+      CompletionOptions,
+    },
+    props: {
+      nodeId: {
+        type: String,
+        required: true,
+      },
+    },
+    data() {
+      return {
+        completionObject: {},
+      };
+    },
+    computed: {
+      ...mapGetters('contentNode', ['getContentNode']),
+      ...mapGetters('file', ['getContentNodeFiles']),
+      contentNode() {
+        return this.getContentNode(this.nodeId);
+      },
+      nodeFiles() {
+        return this.getContentNodeFiles(this.contentNode.id) || [];
+      },
+      fileDuration() {
+        return getFileDuration(this.nodeFiles, this.contentNode.kind);
+      },
+      completionAndDuration: {
+        get() {
+          return this.completionObject;
+        },
+        set({ completion_criteria, ...value }) {
+          this.completionObject = {
+            ...value,
+            ...(completion_criteria || {}),
+          };
+        },
+      },
+    },
+    watch: {
+      completionObject() {
+        this.$nextTick(() => {
+          this.validate();
+        });
+      },
+    },
+    mounted() {
+      const { suggested_duration, extra_fields = {} } = this.contentNode;
+      const { suggested_duration_type, options } = extra_fields || {};
+      const { modality, completion_criteria } = options || {};
+
+      this.completionObject = {
+        suggested_duration,
+        suggested_duration_type,
+        modality,
+        ...(completion_criteria || {}),
+      };
+    },
+    methods: {
+      ...mapActions('contentNode', ['updateContentNode']),
+      validate() {
+        return this.$refs.completionOptions.validate();
+      },
+      handleSave() {
+        const error = this.validate();
+        if (error) {
+          return;
+        }
+        const {
+          suggested_duration,
+          suggested_duration_type,
+          modality,
+          model,
+          threshold,
+          learner_managed,
+        } = this.completionObject;
+        const payload = {
+          suggested_duration,
+          extra_fields: {
+            suggested_duration_type,
+            options: {
+              modality,
+              completion_criteria: {
+                model,
+                threshold,
+                learner_managed,
+              },
+            },
+          },
+        };
+
+        this.updateContentNode({ id: this.nodeId, ...payload });
+        /* eslint-disable-next-line kolibri/vue-no-undefined-string-uses */
+        this.$store.dispatch('showSnackbarSimple', commonStrings.$tr('changesSaved'));
+        this.close();
+      },
+      close() {
+        this.$emit('close');
+      },
+    },
+    $trs: {
+      editCompletion: 'Edit Completion',
+      saveAction: 'Save',
+      cancelAction: 'Cancel',
+    },
+  };
+
+</script>
+
+<style scoped>
+</style>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditLanguageModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditLanguageModal.vue
new file mode 100644
index 0000000000..3a23ccd2a0
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditLanguageModal.vue
@@ -0,0 +1,178 @@
+<template>
+
+  <KModal
+    :title="$tr('editLanguage')"
+    :submitText="$tr('saveAction')"
+    :cancelText="$tr('cancelAction')"
+    data-test="edit-language-modal"
+    :submitDisabled="!selectedLanguage"
+    @submit="handleSave"
+    @cancel="close"
+  >
+    <p v-if="resourcesSelectedText.length > 0" data-test="resources-selected-message">
+      {{ resourcesSelectedText }}
+    </p>
+    <p v-if="isMultipleNodeLanguages" data-test="different-languages-message">
+      {{ $tr('differentLanguages') }}
+    </p>
+    <KTextbox
+      v-model="searchQuery"
+      autofocus
+      data-test="search-input"
+      :label="$tr('selectLanguage')"
+      style="margin-top: 0.5em"
+    />
+    <template v-if="isTopicSelected">
+      <KCheckbox
+        :checked="updateDescendants"
+        data-test="update-descendants-checkbox"
+        :label="$tr('updateDescendantsCheckbox')"
+        @change="(value) => { updateDescendants = value }"
+      />
+      <Divider />
+    </template>
+    <div
+      ref="languages"
+      class="languages-options"
+      data-test="language-options-list"
+    >
+      <KRadioButton
+        v-for="language in languageOptions"
+        :key="language.id"
+        v-model="selectedLanguage"
+        :buttonValue="language.id"
+        :label="languageText(language)"
+      />
+      <p
+        v-if="!languageOptions.length"
+        :style="{ color: $themeTokens.annotation }"
+      >
+        {{ $tr('emptyLanguagesSearch') }}
+      </p>
+    </div>
+  </KModal>
+
+</template>
+
+
+<script>
+
+  import { mapGetters, mapActions } from 'vuex';
+  import { LanguagesList } from 'shared/leUtils/Languages';
+  import { ContentKindsNames } from 'shared/leUtils/ContentKinds';
+  import commonStrings from 'shared/translator';
+
+  export default {
+    name: 'EditLanguageModal',
+    props: {
+      nodeIds: {
+        type: Array,
+        required: true,
+      },
+      resourcesSelectedText: {
+        type: String,
+        default: '',
+      },
+    },
+    data() {
+      return {
+        selectedLanguage: '',
+        searchQuery: '',
+        updateDescendants: false,
+      };
+    },
+    computed: {
+      ...mapGetters('contentNode', ['getContentNodes']),
+      nodes() {
+        return this.getContentNodes(this.nodeIds);
+      },
+      isTopicSelected() {
+        return this.nodes.some(node => node.kind === ContentKindsNames.TOPIC);
+      },
+      languageOptions() {
+        const searchQuery = this.searchQuery.trim().toLowerCase();
+        if (!this.searchQuery) {
+          return LanguagesList;
+        }
+        const criteria = ['id', 'native_name', 'readable_name'];
+        return LanguagesList.filter(lang =>
+          criteria.some(key => lang[key] && lang[key].toLowerCase().includes(searchQuery))
+        );
+      },
+    },
+    created() {
+      const languages = [...new Set(this.nodes.map(node => node.language))];
+      if (languages.length === 1) {
+        this.selectedLanguage = languages[0] || '';
+      }
+      this.isMultipleNodeLanguages = languages.length > 1;
+    },
+    mounted() {
+      if (this.selectedLanguage) {
+        // Search for the selected KRadioButton and scroll to it
+        const selectedInput = this.$refs.languages.querySelector(
+          `input[value="${this.selectedLanguage}"]`
+        );
+        const selectedRadio = selectedInput && selectedInput.parentElement;
+        if (selectedRadio && selectedRadio.scrollIntoView) {
+          selectedRadio.scrollIntoView({ behavior: 'instant' });
+        }
+      }
+    },
+    methods: {
+      ...mapActions('contentNode', ['updateContentNode', 'updateContentNodeDescendants']),
+      languageText(langObject) {
+        return this.$tr('languageItemText', {
+          language: langObject.native_name,
+          code: langObject.id,
+        });
+      },
+      close() {
+        this.$emit('close');
+      },
+      async handleSave() {
+        if (!this.selectedLanguage) {
+          return;
+        }
+
+        await Promise.all(
+          this.nodes.map(node => {
+            if (this.updateDescendants && node.kind === ContentKindsNames.TOPIC) {
+              return this.updateContentNodeDescendants({
+                id: node.id,
+                language: this.selectedLanguage,
+              });
+            }
+            return this.updateContentNode({
+              id: node.id,
+              language: this.selectedLanguage,
+            });
+          })
+        );
+        /* eslint-disable-next-line kolibri/vue-no-undefined-string-uses */
+        this.$store.dispatch('showSnackbarSimple', commonStrings.$tr('changesSaved'));
+        this.close();
+      },
+    },
+    $trs: {
+      editLanguage: 'Edit Language',
+      languageItemText: '{language} ({code})',
+      saveAction: 'Save',
+      cancelAction: 'Cancel',
+      selectLanguage: 'Select / Type Language',
+      differentLanguages:
+        'The selected resources have different languages set. Choosing an option below will apply the language to all the selected resources',
+      updateDescendantsCheckbox:
+        'Apply to all resources and folders nested within the selected folders',
+      emptyLanguagesSearch: 'No languages matches the search',
+    },
+  };
+
+</script>
+
+<style scoped>
+  .languages-options {
+    height: 250px;
+    overflow-y: auto;
+  }
+</style>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditLearningActivitiesModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditLearningActivitiesModal.vue
new file mode 100644
index 0000000000..377717a70b
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditLearningActivitiesModal.vue
@@ -0,0 +1,68 @@
+<template>
+
+  <EditBooleanMapModal
+    field="learning_activities"
+    isDescendantsUpdatable
+    :title="$tr('editLearningActivitiesTitle')"
+    :nodeIds="nodeIds"
+    :validators="learningActivityValidators"
+    :confirmationMessage="changesSaved"
+    :resourcesSelectedText="resourcesSelectedText"
+    @close="() => $emit('close')"
+  >
+    <template #input="{ value, inputHandler }">
+      <LearningActivityOptions
+        expanded
+        hideLabel
+        :value="value"
+        :nodeIds="nodeIds"
+        @input="inputHandler"
+      />
+    </template>
+  </EditBooleanMapModal>
+
+</template>
+
+
+<script>
+
+  import EditBooleanMapModal from './EditBooleanMapModal';
+  import { getLearningActivityValidators } from 'shared/utils/validation';
+  import LearningActivityOptions from 'shared/views/contentNodeFields/LearningActivityOptions';
+  import commonStrings from 'shared/translator';
+
+  export default {
+    name: 'EditLearningActivitiesModal',
+    components: {
+      EditBooleanMapModal,
+      LearningActivityOptions,
+    },
+    props: {
+      nodeIds: {
+        type: Array,
+        required: true,
+      },
+      resourcesSelectedText: {
+        type: String,
+        default: '',
+      },
+    },
+    computed: {
+      learningActivityValidators() {
+        return getLearningActivityValidators();
+      },
+      changesSaved() {
+        /* eslint-disable-next-line kolibri/vue-no-undefined-string-uses */
+        return commonStrings.$tr('changesSaved');
+      },
+    },
+    $trs: {
+      editLearningActivitiesTitle: 'Edit Learning Activities',
+    },
+  };
+
+</script>
+
+
+<style scoped>
+</style>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditLevelsModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditLevelsModal.vue
new file mode 100644
index 0000000000..06b0137ea0
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditLevelsModal.vue
@@ -0,0 +1,63 @@
+<template>
+
+  <EditBooleanMapModal
+    field="grade_levels"
+    isDescendantsUpdatable
+    :title="$tr('editLevelsTitle')"
+    :nodeIds="nodeIds"
+    :confirmationMessage="changesSaved"
+    :resourcesSelectedText="resourcesSelectedText"
+    @close="() => $emit('close')"
+  >
+    <template #input="{ value, inputHandler }">
+      <LevelsOptions
+        expanded
+        hideLabel
+        :value="value"
+        :nodeIds="nodeIds"
+        @input="inputHandler"
+      />
+    </template>
+  </EditBooleanMapModal>
+
+</template>
+
+
+<script>
+
+  import EditBooleanMapModal from './EditBooleanMapModal';
+  import LevelsOptions from 'shared/views/contentNodeFields/LevelsOptions';
+  import commonStrings from 'shared/translator';
+
+  export default {
+    name: 'EditLevelsModal',
+    components: {
+      LevelsOptions,
+      EditBooleanMapModal,
+    },
+    props: {
+      nodeIds: {
+        type: Array,
+        required: true,
+      },
+      resourcesSelectedText: {
+        type: String,
+        default: '',
+      },
+    },
+    computed: {
+      changesSaved() {
+        /* eslint-disable-next-line kolibri/vue-no-undefined-string-uses */
+        return commonStrings.$tr('changesSaved');
+      },
+    },
+    $trs: {
+      editLevelsTitle: 'Edit Levels',
+    },
+  };
+
+</script>
+
+
+<style scoped>
+</style>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditResourcesNeededModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditResourcesNeededModal.vue
new file mode 100644
index 0000000000..f7ee9ace3c
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditResourcesNeededModal.vue
@@ -0,0 +1,63 @@
+<template>
+
+  <EditBooleanMapModal
+    field="learner_needs"
+    isDescendantsUpdatable
+    :title="$tr('editResourcesNeededTitle')"
+    :nodeIds="nodeIds"
+    :confirmationMessage="changesSaved"
+    :resourcesSelectedText="resourcesSelectedText"
+    @close="() => $emit('close')"
+  >
+    <template #input="{ value, inputHandler }">
+      <ResourcesNeededOptions
+        expanded
+        hideLabel
+        :value="value"
+        :nodeIds="nodeIds"
+        @input="inputHandler"
+      />
+    </template>
+  </EditBooleanMapModal>
+
+</template>
+
+
+<script>
+
+  import EditBooleanMapModal from './EditBooleanMapModal';
+  import ResourcesNeededOptions from 'shared/views/contentNodeFields/ResourcesNeededOptions';
+  import commonStrings from 'shared/translator';
+
+  export default {
+    name: 'EditResourcesNeededModal',
+    components: {
+      EditBooleanMapModal,
+      ResourcesNeededOptions,
+    },
+    props: {
+      nodeIds: {
+        type: Array,
+        required: true,
+      },
+      resourcesSelectedText: {
+        type: String,
+        default: '',
+      },
+    },
+    computed: {
+      changesSaved() {
+        /* eslint-disable-next-line kolibri/vue-no-undefined-string-uses */
+        return commonStrings.$tr('changesSaved');
+      },
+    },
+    $trs: {
+      editResourcesNeededTitle: 'What will you need?',
+    },
+  };
+
+</script>
+
+
+<style scoped>
+</style>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditSourceModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditSourceModal.vue
new file mode 100644
index 0000000000..8e5524bd27
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditSourceModal.vue
@@ -0,0 +1,328 @@
+<template>
+
+  <div>
+    <KModal
+      v-if="!isAboutLicensesModalOpen"
+      :title="$tr('editAttribution')"
+      :submitText="$tr('saveAction')"
+      :cancelText="$tr('cancelAction')"
+      data-test="edit-source-modal"
+      @submit="handleSave"
+      @cancel="close"
+    >
+      <p v-if="resourcesSelectedText.length > 0" data-test="resources-selected-message">
+        {{ resourcesSelectedText }}
+      </p>
+      <div class="form-item">
+        <div class="input-container">
+          <KTextbox
+            v-model="author_value"
+            autofocus
+            data-test="author-input"
+            :maxlength="200"
+            :disabled="!isEditable"
+            :label="$tr('authorLabel')"
+            class="input-textbox"
+          />
+          <HelpTooltip :text="$tr('authorToolTip')" top :small="false" class="input-tooltip" />
+        </div>
+        <p v-if="helpText" class="help">
+          {{ helpText }}
+        </p>
+      </div>
+      <div class="form-item">
+        <div class="input-container">
+          <KTextbox
+            v-model="provider_value"
+            data-test="provider-input"
+            :maxlength="200"
+            :disabled="!isEditable"
+            :label="$tr('providerLabel')"
+            class="input-textbox"
+          />
+          <HelpTooltip :text="$tr('providerToolTip')" top :small="false" class="input-tooltip" />
+        </div>
+      </div>
+      <div class="form-item">
+        <div class="input-container">
+          <KTextbox
+            v-model="aggregator_value"
+            data-test="aggregator-input"
+            :maxlength="200"
+            :disabled="!isEditable"
+            :label="$tr('aggregatorLabel')"
+            class="input-textbox"
+          />
+          <HelpTooltip :text="$tr('aggregatorToolTip')" top :small="false" class="input-tooltip" />
+        </div>
+      </div>
+      <div class="form-item">
+        <div class="input-container">
+          <LicenseDropdown
+            v-model="licenseItem"
+            box
+            :required="isEditable"
+            :disabled="!isEditable"
+          />
+        </div>
+        <p v-if="helpText" class="help" style="margin-bottom: 8px">
+          {{ helpText }}
+        </p>
+      </div>
+      <div class="form-item">
+        <div class="input-container">
+          <KTextbox
+            v-model="copyright_holder_value"
+            data-test="copyright-holder-input"
+            showInvalidText
+            :maxlength="200"
+            :label="$tr('copyrightHolderLabel')"
+            :invalid="!!copyrightHolderError"
+            :invalidText="copyrightHolderError"
+            :disabled="!isEditable"
+            class="input-textbox"
+            @input="copyrightHolderError = ''"
+            @blur="validateCopyrightHolder"
+          />
+        </div>
+        <p v-if="helpText" class="help">
+          {{ helpText }}
+        </p>
+      </div>
+    </KModal>
+  </div>
+
+</template>
+
+
+<script>
+
+  import { mapActions, mapGetters } from 'vuex';
+  import { isDisableSourceEdits } from '../../utils';
+  import { nonUniqueValue } from 'shared/constants';
+  import HelpTooltip from 'shared/views/HelpTooltip';
+  import LicenseDropdown from 'shared/views/LicenseDropdown';
+  import { getCopyrightHolderValidators, getInvalidText } from 'shared/utils/validation';
+  import commonStrings from 'shared/translator';
+
+  function generateGetterSetter(key) {
+    return {
+      get() {
+        if (this[key] === nonUniqueValue) {
+          return this.$tr('mixed');
+        }
+        return this[key];
+      },
+      set(value) {
+        this[key] = value;
+      },
+    };
+  }
+
+  function mapFormGettersSetters(keys) {
+    return keys.reduce((acc, key) => {
+      acc[`${key}_value`] = generateGetterSetter(key);
+      return acc;
+    }, {});
+  }
+
+  const sourceKeys = [
+    'author',
+    'provider',
+    'aggregator',
+    'license',
+    'license_description',
+    'copyright_holder',
+  ];
+
+  export default {
+    name: 'EditSourceModal',
+    components: {
+      HelpTooltip,
+      LicenseDropdown,
+    },
+    props: {
+      nodeIds: {
+        type: Array,
+        required: true,
+      },
+      resourcesSelectedText: {
+        type: String,
+        default: '',
+      },
+    },
+    data() {
+      /* eslint-disable  kolibri/vue-no-unused-properties */
+      return {
+        author: '',
+        provider: '',
+        aggregator: '',
+        license: '',
+        license_description: '',
+        copyright_holder: '',
+        copyrightHolderError: '',
+      };
+      /* eslint-enable  kolibri/vue-no-unused-properties */
+    },
+    computed: {
+      ...mapGetters(['isAboutLicensesModalOpen']),
+      ...mapGetters('contentNode', ['getContentNodes']),
+      ...mapFormGettersSetters(sourceKeys),
+      nodes() {
+        return this.getContentNodes(this.nodeIds);
+      },
+      licenseItem: {
+        get() {
+          const { license, license_description } = this;
+          return {
+            license,
+            license_description,
+          };
+        },
+        set(value) {
+          this.license = value.license;
+          this.license_description = value.license_description;
+        },
+      },
+      isEditable() {
+        return this.nodes.some(node => !isDisableSourceEdits(node));
+      },
+      hasSomeEditDisabled() {
+        return this.nodes.some(node => isDisableSourceEdits(node));
+      },
+      hasError() {
+        return this.copyrightHolderError;
+      },
+      helpText() {
+        if (!this.isEditable) {
+          return this.$tr('cannotEditPublic');
+        }
+        if (this.hasSomeEditDisabled) {
+          return this.$tr('editOnlyLocal');
+        }
+        return '';
+      },
+    },
+    created() {
+      const values = {};
+      this.nodes.forEach(node => {
+        sourceKeys.forEach(prop => {
+          if (node[prop]) {
+            if (!values[prop]) {
+              values[prop] = node[prop];
+            } else if (values[prop] !== node[prop]) {
+              values[prop] = nonUniqueValue;
+            }
+          }
+        });
+      });
+      sourceKeys.forEach(prop => {
+        this[prop] = values[prop] || '';
+      });
+    },
+    methods: {
+      ...mapActions('contentNode', ['updateContentNode']),
+      close() {
+        this.$emit('close');
+      },
+      validateCopyrightHolder() {
+        if (this.copyright_holder === nonUniqueValue) {
+          return;
+        }
+        this.copyrightHolderError = getInvalidText(
+          getCopyrightHolderValidators(),
+          this.copyright_holder
+        );
+      },
+      validate() {
+        // License is required, but it is handled by the LicenseDropdown component
+        this.validateCopyrightHolder();
+      },
+      async handleSave() {
+        if (!this.isEditable) {
+          return this.close();
+        }
+        this.validate();
+        if (this.hasError) {
+          return;
+        }
+        const nodesToEdit = this.nodes.filter(node => !isDisableSourceEdits(node));
+        await Promise.all(
+          nodesToEdit.map(node => {
+            const payload = {
+              id: node.id,
+            };
+            sourceKeys.forEach(prop => {
+              const value = this[prop];
+              if (value !== nonUniqueValue) {
+                payload[prop] = value;
+              }
+            });
+            return this.updateContentNode(payload);
+          })
+        );
+        /* eslint-disable-next-line kolibri/vue-no-undefined-string-uses */
+        this.$store.dispatch('showSnackbarSimple', commonStrings.$tr('changesSaved'));
+        this.close();
+      },
+    },
+    $trs: {
+      editAttribution: 'Edit Attribution',
+      authorLabel: 'Author',
+      authorToolTip: 'Person or organization who created this content',
+      providerLabel: 'Provider',
+      providerToolTip: 'Organization that commissioned or is distributing the content',
+      aggregatorLabel: 'Aggregator',
+      aggregatorToolTip:
+        'Website or org hosting the content collection but not necessarily the creator or copyright holder',
+      copyrightHolderLabel: 'Copyright holder',
+      cannotEditPublic: 'Cannot edit for public channel resources',
+      editOnlyLocal: 'Edits will be reflected only for local resources',
+      mixed: 'Mixed',
+      saveAction: 'Save',
+      cancelAction: 'Cancel',
+    },
+  };
+
+</script>
+
+<style lang="scss" scoped>
+
+  .form-item {
+    position: relative;
+
+    &:not(:last-of-type) {
+      margin-bottom: 10px;
+    }
+
+    > p.help {
+      position: absolute;
+      bottom: 0;
+      left: 10px;
+      margin-bottom: 14px;
+      font-size: 12px;
+      color: var(--v-text-lighten4);
+    }
+
+    .input-container {
+      position: relative;
+      display: flex;
+      align-items: flex-start;
+
+      .input-textbox {
+        width: 100%;
+      }
+
+      .input-tooltip {
+        position: absolute;
+        right: 12px;
+        margin: 14px 0 0 8px;
+      }
+
+      /deep/ input {
+        padding-right: 40px;
+      }
+    }
+  }
+
+</style>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditTitleDescriptionModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditTitleDescriptionModal.vue
new file mode 100644
index 0000000000..37e59e64a7
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditTitleDescriptionModal.vue
@@ -0,0 +1,103 @@
+<template>
+
+  <div>
+    <KModal
+      :title="$tr('editTitleDescription')"
+      :submitText="$tr('saveAction')"
+      :cancelText="$tr('cancelAction')"
+      data-test="edit-title-description-modal"
+      @submit="handleSave"
+      @cancel="close"
+    >
+      <KTextbox
+        v-model="title"
+        data-test="title-input"
+        autofocus
+        showInvalidText
+        :maxlength="200"
+        :label="$tr('titleLabel')"
+        :invalid="!!titleError"
+        :invalidText="titleError"
+        @input="titleError = ''"
+        @blur="validateTitle"
+      />
+      <KTextbox
+        v-model="description"
+        data-test="description-input"
+        textArea
+        :maxlength="400"
+        :label="$tr('descriptionLabel')"
+        style="margin-top: 0.5em"
+      />
+    </KModal>
+  </div>
+
+</template>
+
+
+<script>
+
+  import { mapActions, mapGetters } from 'vuex';
+  import { getTitleValidators, getInvalidText } from 'shared/utils/validation';
+  import commonStrings from 'shared/translator';
+
+  export default {
+    name: 'EditTitleDescriptionModal',
+    props: {
+      nodeId: {
+        type: String,
+        required: true,
+      },
+    },
+    data() {
+      return {
+        title: '',
+        description: '',
+        titleError: '',
+      };
+    },
+    computed: {
+      ...mapGetters('contentNode', ['getContentNode']),
+      contentNode() {
+        return this.getContentNode(this.nodeId);
+      },
+    },
+    created() {
+      this.title = this.contentNode.title || '';
+      this.description = this.contentNode.description || '';
+    },
+    methods: {
+      ...mapActions('contentNode', ['updateContentNode']),
+      validateTitle() {
+        this.titleError = getInvalidText(getTitleValidators(), this.title);
+      },
+      close() {
+        this.$emit('close');
+      },
+      async handleSave() {
+        this.validateTitle();
+        if (this.titleError) {
+          return;
+        }
+
+        const { nodeId, title, description } = this;
+        await this.updateContentNode({
+          id: nodeId,
+          title: title.trim(),
+          description: description.trim(),
+        });
+        /* eslint-disable-next-line kolibri/vue-no-undefined-string-uses */
+        this.$store.dispatch('showSnackbarSimple', commonStrings.$tr('changesSaved'));
+        this.close();
+      },
+    },
+    $trs: {
+      editTitleDescription: 'Edit Title and Description',
+      titleLabel: 'Title',
+      descriptionLabel: 'Description',
+      saveAction: 'Save',
+      cancelAction: 'Cancel',
+    },
+  };
+
+</script>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/__tests__/EditAudienceModal.spec.js b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/__tests__/EditAudienceModal.spec.js
new file mode 100644
index 0000000000..2201530c35
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/__tests__/EditAudienceModal.spec.js
@@ -0,0 +1,258 @@
+import { mount } from '@vue/test-utils';
+import Vuex from 'vuex';
+import EditAudienceModal from '../EditAudienceModal';
+import { ResourcesNeededTypes } from 'shared/constants';
+import { RolesNames } from 'shared/leUtils/Roles';
+
+let nodes;
+
+let store;
+let contentNodeActions;
+let generalActions;
+
+const getRolesValues = wrapper => {
+  const roles = {};
+  const radioBtns = wrapper.findAll('[data-test="rol-radio-button"]');
+  radioBtns.wrappers.forEach(checkbox => {
+    const { value, currentValue } = checkbox.vm.$props || {};
+    roles[value] = currentValue === value;
+  });
+  return roles;
+};
+
+const selectRole = (wrapper, rol) => {
+  const radioBtn = wrapper.find(`[data-test="rol-radio-button"] input[value="${rol}"]`);
+  radioBtn.setChecked(true);
+};
+
+const isForBeginnersChecked = wrapper => {
+  return wrapper.find('[data-test="for-beginners-checkbox"] input').element.checked;
+};
+
+const checkForBeginners = wrapper => {
+  wrapper.find('[data-test="for-beginners-checkbox"] input').setChecked(true);
+};
+
+const makeWrapper = nodeIds => {
+  return mount(EditAudienceModal, {
+    store,
+    propsData: {
+      nodeIds,
+      resourcesSelectedText: '2 resources',
+    },
+  });
+};
+
+describe('EditAudienceModal', () => {
+  beforeEach(() => {
+    nodes = {
+      node1: { id: 'node1' },
+      node2: { id: 'node2' },
+    };
+    contentNodeActions = {
+      updateContentNode: jest.fn(),
+    };
+    generalActions = {
+      showSnackbarSimple: jest.fn(),
+    };
+    store = new Vuex.Store({
+      actions: generalActions,
+      modules: {
+        contentNode: {
+          namespaced: true,
+          actions: contentNodeActions,
+          getters: {
+            getContentNodes: () => ids => ids.map(id => nodes[id]),
+          },
+        },
+      },
+    });
+  });
+
+  test('smoke test', () => {
+    const wrapper = makeWrapper(['node1']);
+    expect(wrapper.isVueInstance()).toBe(true);
+  });
+
+  describe('Selected audience on first render', () => {
+    test('no rol should be selected if a single node does not have set rol', () => {
+      const wrapper = makeWrapper(['node1']);
+
+      const rolesValues = getRolesValues(wrapper);
+      Object.values(rolesValues).forEach(value => {
+        expect(value).toBeFalsy();
+      });
+    });
+
+    test('no rol should be selected if just a single node among multiple nodes does not have rol set', () => {
+      nodes['node1'].role_visibility = RolesNames.COACH;
+
+      const wrapper = makeWrapper(['node1', 'node2']);
+
+      const rolesValues = getRolesValues(wrapper);
+      Object.values(rolesValues).forEach(value => {
+        expect(value).toBeFalsy();
+      });
+    });
+
+    test('no rol should be selected if there are multiple roles set', () => {
+      nodes['node1'].role_visibility = RolesNames.COACH;
+      nodes['node2'].role_visibility = RolesNames.LEARNER;
+
+      const wrapper = makeWrapper(['node1', 'node2']);
+
+      const rolesValues = getRolesValues(wrapper);
+      Object.values(rolesValues).forEach(value => {
+        expect(value).toBeFalsy();
+      });
+    });
+
+    test('the common rol should be selected if all nodes have the same rol visibility', () => {
+      nodes['node1'].role_visibility = RolesNames.COACH;
+      nodes['node2'].role_visibility = RolesNames.COACH;
+
+      const wrapper = makeWrapper(['node1', 'node2']);
+
+      const rolesValues = getRolesValues(wrapper);
+      expect(rolesValues[RolesNames.COACH]).toBeTruthy();
+    });
+
+    test('for beginners checkbox should be unselected if no node is set for beginners', () => {
+      const wrapper = makeWrapper(['node1']);
+
+      expect(isForBeginnersChecked(wrapper)).toBeFalsy();
+    });
+
+    test('for beginners checkbox should be unselected if just a single node among multiple nodes is not set for beginners', () => {
+      nodes['node1'].learner_needs = {
+        [ResourcesNeededTypes.FOR_BEGINNERS]: true,
+      };
+
+      const wrapper = makeWrapper(['node1', 'node2']);
+
+      expect(isForBeginnersChecked(wrapper)).toBeFalsy();
+    });
+
+    test('for beginners checkbox should be selected if all nodes are set for beginners', () => {
+      nodes['node1'].learner_needs = {
+        [ResourcesNeededTypes.FOR_BEGINNERS]: true,
+      };
+      nodes['node2'].learner_needs = {
+        [ResourcesNeededTypes.FOR_BEGINNERS]: true,
+      };
+
+      const wrapper = makeWrapper(['node1', 'node2']);
+
+      expect(isForBeginnersChecked(wrapper)).toBeTruthy();
+    });
+
+    test('should display information message about different roles visibilities if there are multiple roles set', () => {
+      nodes['node1'].role_visibility = RolesNames.COACH;
+      nodes['node2'].role_visibility = RolesNames.LEARNER;
+
+      const wrapper = makeWrapper(['node1', 'node2']);
+
+      expect(wrapper.find('[data-test="multiple-audience-message"]').exists()).toBeTruthy();
+    });
+
+    test('should not display information message about different roles visibilities if just some nodes are set for beginners', () => {
+      nodes['node1'].learner_needs = {
+        [ResourcesNeededTypes.FOR_BEGINNERS]: true,
+      };
+
+      const wrapper = makeWrapper(['node1', 'node2']);
+
+      expect(wrapper.find('[data-test="multiple-audience-message"]').exists()).toBeTruthy();
+    });
+
+    test('should not display information message about different roles visibilities if all nodes have the same rol visibility and are set for beginners', () => {
+      nodes['node1'].role_visibility = RolesNames.COACH;
+      nodes['node1'].learner_needs = {
+        [ResourcesNeededTypes.FOR_BEGINNERS]: true,
+      };
+      nodes['node2'].role_visibility = RolesNames.COACH;
+      nodes['node2'].learner_needs = {
+        [ResourcesNeededTypes.FOR_BEGINNERS]: true,
+      };
+
+      const wrapper = makeWrapper(['node1', 'node2']);
+
+      expect(wrapper.find('[data-test="multiple-audience-message"]').exists()).toBeFalsy();
+    });
+  });
+
+  test('should render the message of the number of resources selected', () => {
+    const wrapper = makeWrapper(['node1', 'node2']);
+
+    const resourcesCounter = wrapper.find('[data-test="resources-selected-message"]');
+    expect(resourcesCounter.exists()).toBeTruthy();
+    expect(resourcesCounter.text()).toContain('2');
+  });
+
+  test('should call updateContentNode with the right rol on success submit', () => {
+    const wrapper = makeWrapper(['node1']);
+
+    selectRole(wrapper, RolesNames.COACH);
+    wrapper.find('[data-test="edit-audience-modal"]').vm.$emit('submit');
+
+    const animationFrameId = requestAnimationFrame(() => {
+      expect(contentNodeActions.updateContentNode).toHaveBeenCalledWith(expect.anything(), {
+        id: 'node1',
+        role_visibility: RolesNames.COACH,
+      });
+      cancelAnimationFrame(animationFrameId);
+    });
+  });
+
+  test('should call updateContentNode with the need for beginners set on success submit', () => {
+    const wrapper = makeWrapper(['node1']);
+
+    checkForBeginners(wrapper);
+    wrapper.find('[data-test="edit-audience-modal"]').vm.$emit('submit');
+
+    const animationFrameId = requestAnimationFrame(() => {
+      expect(contentNodeActions.updateContentNode).toHaveBeenCalledWith(expect.anything(), {
+        id: 'node1',
+        learner_needs: {
+          [ResourcesNeededTypes.FOR_BEGINNERS]: true,
+        },
+      });
+      cancelAnimationFrame(animationFrameId);
+    });
+  });
+
+  test('should emit close event on success submit', () => {
+    const wrapper = makeWrapper(['node1']);
+
+    selectRole(wrapper, RolesNames.COACH);
+    wrapper.find('[data-test="edit-audience-modal"]').vm.$emit('submit');
+
+    const animationFrameId = requestAnimationFrame(() => {
+      expect(wrapper.emitted('close')).toBeTruthy();
+      cancelAnimationFrame(animationFrameId);
+    });
+  });
+
+  test('should emit close event on cancel', () => {
+    const wrapper = makeWrapper(['node1']);
+
+    wrapper.find('[data-test="edit-audience-modal"]').vm.$emit('cancel');
+
+    const animationFrameId = requestAnimationFrame(() => {
+      expect(wrapper.emitted('close')).toBeTruthy();
+      cancelAnimationFrame(animationFrameId);
+    });
+  });
+
+  test('should show a confirmation snackbar on success submit', () => {
+    const wrapper = makeWrapper(['node1']);
+
+    selectRole(wrapper, RolesNames.COACH);
+    wrapper.find('[data-test="edit-audience-modal"]').vm.$emit('submit');
+
+    const animationFrameId = requestAnimationFrame(() => {
+      expect(generalActions.showSnackbarSimple).toHaveBeenCalled();
+      cancelAnimationFrame(animationFrameId);
+    });
+  });
+});
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/__tests__/EditBooleanMapModal.spec.js b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/__tests__/EditBooleanMapModal.spec.js
new file mode 100644
index 0000000000..43e7237d41
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/__tests__/EditBooleanMapModal.spec.js
@@ -0,0 +1,346 @@
+import Vuex from 'vuex';
+import { mount } from '@vue/test-utils';
+import camelCase from 'lodash/camelCase';
+import EditBooleanMapModal from '../EditBooleanMapModal';
+import { metadataTranslationMixin } from 'shared/mixins';
+import { ContentKindsNames } from 'shared/leUtils/ContentKinds';
+import { Categories } from 'shared/constants';
+import CategoryOptions from 'shared/views/contentNodeFields/CategoryOptions';
+
+let nodes;
+
+let store;
+let contentNodeActions;
+let generalActions;
+
+const CheckboxValue = {
+  UNCHECKED: 'UNCHECKED',
+  CHECKED: 'CHECKED',
+  INDETERMINATE: 'INDETERMINATE',
+};
+
+const { translateMetadataString } = metadataTranslationMixin.methods;
+
+const categoriesLookup = {};
+Object.entries(Categories).forEach(([key, value]) => {
+  const newKey = translateMetadataString(camelCase(key));
+  categoriesLookup[newKey] = value;
+});
+
+const getOptionsValues = wrapper => {
+  const categories = {};
+  const checkboxes = wrapper.findAll('[data-test="option-checkbox"]');
+  checkboxes.wrappers.forEach(checkbox => {
+    const { label, checked, indeterminate } = checkbox.vm.$props || {};
+    let value;
+    if (indeterminate) {
+      value = CheckboxValue.INDETERMINATE;
+    } else if (checked) {
+      value = CheckboxValue.CHECKED;
+    } else {
+      value = CheckboxValue.UNCHECKED;
+    }
+    categories[categoriesLookup[label]] = value;
+  });
+  return categories;
+};
+
+const findOptionCheckbox = (wrapper, category) => {
+  const checkboxes = wrapper.findAll('[data-test="option-checkbox"]');
+  return checkboxes.wrappers.find(checkbox => {
+    const { label } = checkbox.vm.$props || {};
+    return categoriesLookup[label] === category;
+  });
+};
+
+const options = Object.entries(Categories).map(([key, value]) => {
+  return {
+    label: key,
+    value,
+  };
+});
+const makeWrapper = ({ nodeIds, field = 'categories', ...restOptions }) => {
+  return mount(EditBooleanMapModal, {
+    store,
+    propsData: {
+      nodeIds,
+      options,
+      title: 'Edit Categories',
+      field,
+      autocompleteLabel: 'Select option',
+      confirmationMessage: 'edited',
+      resourcesSelectedText: '2 resources',
+      ...restOptions,
+    },
+    scopedSlots: {
+      input: function(props) {
+        return this.$createElement(CategoryOptions, {
+          props: {
+            ...props,
+            expanded: true,
+            hideLabel: true,
+            nodeIds,
+          },
+        });
+      },
+    },
+  });
+};
+
+describe('EditBooleanMapModal', () => {
+  beforeEach(() => {
+    nodes = {
+      node1: { id: 'node1' },
+      node2: { id: 'node2' },
+      node3: { id: 'node3' },
+      node4: { id: 'node4' },
+    };
+    contentNodeActions = {
+      updateContentNode: jest.fn(),
+      updateContentNodeDescendants: jest.fn(),
+    };
+    generalActions = {
+      showSnackbarSimple: jest.fn(),
+    };
+    store = new Vuex.Store({
+      actions: generalActions,
+      modules: {
+        contentNode: {
+          namespaced: true,
+          actions: contentNodeActions,
+          getters: {
+            getContentNodes: () => ids => ids.map(id => nodes[id]),
+          },
+        },
+      },
+    });
+  });
+
+  test('smoke test', () => {
+    const wrapper = makeWrapper({ nodeIds: ['node1'] });
+    expect(wrapper.isVueInstance()).toBe(true);
+  });
+
+  describe('Selected options on first render', () => {
+    describe('Options checkboxes', () => {
+      test('no option should be selected if a single node does not have options set', () => {
+        const wrapper = makeWrapper({ nodeIds: ['node1'] });
+
+        const optionsValues = getOptionsValues(wrapper);
+        expect(
+          Object.values(optionsValues).every(value => value === CheckboxValue.UNCHECKED)
+        ).toBeTruthy();
+      });
+
+      test('no option should be selected if multiple nodes dont have options set', () => {
+        const wrapper = makeWrapper({ nodeIds: ['node1', 'node2'] });
+
+        const optionsValues = getOptionsValues(wrapper);
+        expect(
+          Object.values(optionsValues).every(value => value === CheckboxValue.UNCHECKED)
+        ).toBeTruthy();
+      });
+
+      test('checkbox options should be selected depending on the options set for a single node - categories', () => {
+        nodes['node1'].categories = {
+          [Categories.DAILY_LIFE]: true,
+          [Categories.FOUNDATIONS]: true,
+        };
+
+        const wrapper = makeWrapper({ nodeIds: ['node1'] });
+
+        const optionsValues = getOptionsValues(wrapper);
+        const {
+          [Categories.DAILY_LIFE]: dailyLifeValue,
+          [Categories.FOUNDATIONS]: foundationsValue,
+          ...otheroptionsValues
+        } = optionsValues;
+        expect(
+          Object.values(otheroptionsValues).every(value => value === CheckboxValue.UNCHECKED)
+        ).toBeTruthy();
+        expect(dailyLifeValue).toBe(CheckboxValue.CHECKED);
+        expect(foundationsValue).toBe(CheckboxValue.CHECKED);
+      });
+
+      test('checkbox option should be checked if all nodes have the same option set', () => {
+        nodes['node1'].categories = {
+          [Categories.DAILY_LIFE]: true,
+          [Categories.FOUNDATIONS]: true,
+        };
+        nodes['node2'].categories = {
+          [Categories.DAILY_LIFE]: true,
+          [Categories.FOUNDATIONS]: true,
+        };
+
+        const wrapper = makeWrapper({ nodeIds: ['node1', 'node2'] });
+
+        const optionsValues = getOptionsValues(wrapper);
+        const {
+          [Categories.DAILY_LIFE]: dailyLifeValue,
+          [Categories.FOUNDATIONS]: foundationsValue,
+        } = optionsValues;
+        expect(dailyLifeValue).toBe(CheckboxValue.CHECKED);
+        expect(foundationsValue).toBe(CheckboxValue.CHECKED);
+      });
+
+      test('checkbox option should be indeterminate if not all nodes have the same options set', () => {
+        nodes['node1'].categories = {
+          [Categories.DAILY_LIFE]: true,
+          [Categories.FOUNDATIONS]: true,
+        };
+        nodes['node2'].categories = {
+          [Categories.DAILY_LIFE]: true,
+        };
+
+        const wrapper = makeWrapper({ nodeIds: ['node1', 'node2'] });
+
+        const optionsValues = getOptionsValues(wrapper);
+        const {
+          [Categories.DAILY_LIFE]: dailyLifeValue,
+          [Categories.FOUNDATIONS]: foundationsValue,
+        } = optionsValues;
+        expect(dailyLifeValue).toBe(CheckboxValue.CHECKED);
+        expect(foundationsValue).toBe(CheckboxValue.INDETERMINATE);
+      });
+    });
+  });
+
+  test('should render the message of the number of resources selected', () => {
+    const wrapper = makeWrapper({ nodeIds: ['node1', 'node2'] });
+
+    const resourcesCounter = wrapper.find('[data-test="resources-selected-message"]');
+    expect(resourcesCounter.exists()).toBeTruthy();
+    expect(resourcesCounter.text()).toContain('2');
+  });
+
+  test('should render the message of the number of resources selected - 2', () => {
+    const wrapper = makeWrapper({ nodeIds: ['node1', 'node2', 'node3', 'node4'] });
+
+    const resourcesCounter = wrapper.find('[data-test="resources-selected-message"]');
+    expect(resourcesCounter.exists()).toBeTruthy();
+    expect(resourcesCounter.text()).toContain('2 resources');
+  });
+
+  describe('Submit', () => {
+    test('should call updateContentNode with the right options on success submit - categories', () => {
+      const wrapper = makeWrapper({ nodeIds: ['node1', 'node2'] });
+
+      const schoolCheckbox = findOptionCheckbox(wrapper, Categories.SCHOOL);
+      schoolCheckbox.element.click();
+      const sociologyCheckbox = findOptionCheckbox(wrapper, Categories.SOCIOLOGY);
+      sociologyCheckbox.element.click();
+
+      const animationFrameId = requestAnimationFrame(() => {
+        wrapper.find('[data-test="edit-booleanMap-modal"]').vm.$emit('submit');
+        expect(contentNodeActions.updateContentNode).toHaveBeenCalledWith(expect.anything(), {
+          id: 'node1',
+          categories: {
+            [Categories.SCHOOL]: true,
+            [Categories.SOCIOLOGY]: true,
+          },
+        });
+        expect(contentNodeActions.updateContentNode).toHaveBeenCalledWith(expect.anything(), {
+          id: 'node2',
+          categories: {
+            [Categories.SCHOOL]: true,
+            [Categories.SOCIOLOGY]: true,
+          },
+        });
+        cancelAnimationFrame(animationFrameId);
+      });
+    });
+
+    test('should emit close event on success submit', () => {
+      const wrapper = makeWrapper({ nodeIds: ['node1'] });
+
+      wrapper.find('[data-test="edit-booleanMap-modal"]').vm.$emit('submit');
+
+      const animationFrameId = requestAnimationFrame(() => {
+        expect(wrapper.emitted('close')).toBeTruthy();
+        cancelAnimationFrame(animationFrameId);
+      });
+    });
+
+    test('should show a confirmation snackbar on success submit', () => {
+      const wrapper = makeWrapper({ nodeIds: ['node1'] });
+
+      wrapper.find('[data-test="edit-booleanMap-modal"]').vm.$emit('submit');
+
+      const animationFrameId = requestAnimationFrame(() => {
+        expect(generalActions.showSnackbarSimple).toHaveBeenCalled();
+        cancelAnimationFrame(animationFrameId);
+      });
+    });
+  });
+
+  test('should emit close event on cancel', () => {
+    const wrapper = makeWrapper({ nodeIds: ['node1'] });
+
+    wrapper.find('[data-test="edit-booleanMap-modal"]').vm.$emit('cancel');
+
+    const animationFrameId = requestAnimationFrame(() => {
+      expect(wrapper.emitted('close')).toBeTruthy();
+      cancelAnimationFrame(animationFrameId);
+    });
+  });
+
+  describe('topic nodes present', () => {
+    test('should display the checkbox to apply change to descendants if a topic is present and is descendants updatable', () => {
+      nodes['node1'].kind = ContentKindsNames.TOPIC;
+
+      const wrapper = makeWrapper({ nodeIds: ['node1', 'node2'], isDescendantsUpdatable: true });
+
+      expect(wrapper.find('[data-test="update-descendants-checkbox"]').exists()).toBeTruthy();
+    });
+
+    test('should not display the checkbox to apply change to descendants if a topic is not present even though its descendants updatable', () => {
+      const wrapper = makeWrapper({ nodeIds: ['node1', 'node2'], isDescendantsUpdatable: true });
+
+      expect(wrapper.find('[data-test="update-descendants-checkbox"]').exists()).toBeFalsy();
+    });
+
+    test('should not display the checkbox to apply change to descendants if is not descendants updatable', () => {
+      nodes['node1'].kind = ContentKindsNames.TOPIC;
+
+      const wrapper = makeWrapper({ nodeIds: ['node1', 'node2'], isDescendantsUpdatable: false });
+
+      expect(wrapper.find('[data-test="update-descendants-checkbox"]').exists()).toBeFalsy();
+    });
+
+    test('should call updateContentNode on success submit if the user does not check the update descendants checkbox', () => {
+      nodes['node1'].kind = ContentKindsNames.TOPIC;
+
+      const wrapper = makeWrapper({ nodeIds: ['node1'], isDescendantsUpdatable: true });
+
+      wrapper.find('[data-test="edit-booleanMap-modal"]').vm.$emit('submit');
+
+      const animationFrameId = requestAnimationFrame(() => {
+        expect(contentNodeActions.updateContentNode).toHaveBeenCalledWith(expect.anything(), {
+          id: 'node1',
+          categories: {},
+        });
+        cancelAnimationFrame(animationFrameId);
+      });
+    });
+
+    test('should call updateContentNodeDescendants on success submit if the user checks the descendants checkbox', () => {
+      nodes['node1'].kind = ContentKindsNames.TOPIC;
+
+      const wrapper = makeWrapper({ nodeIds: ['node1'], isDescendantsUpdatable: true });
+
+      wrapper.find('[data-test="update-descendants-checkbox"] input').setChecked(true);
+      wrapper.find('[data-test="edit-booleanMap-modal"]').vm.$emit('submit');
+
+      const animationFrameId = requestAnimationFrame(() => {
+        expect(contentNodeActions.updateContentNodeDescendants).toHaveBeenCalledWith(
+          expect.anything(),
+          {
+            id: 'node1',
+            categories: {},
+          }
+        );
+        cancelAnimationFrame(animationFrameId);
+      });
+    });
+  });
+});
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/__tests__/EditLanguageModal.spec.js b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/__tests__/EditLanguageModal.spec.js
new file mode 100644
index 0000000000..4a53039d92
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/__tests__/EditLanguageModal.spec.js
@@ -0,0 +1,258 @@
+import { mount } from '@vue/test-utils';
+import Vuex from 'vuex';
+import EditLanguageModal from '../EditLanguageModal';
+import { LanguagesList } from 'shared/leUtils/Languages';
+import { ContentKindsNames } from 'shared/leUtils/ContentKinds';
+
+const nodes = [
+  { id: 'test-en-res', language: 'en' },
+  { id: 'test-es-res', language: 'es' },
+  { id: 'test-nolang-res', language: '' },
+  { id: 'test-en-topic', language: 'en', kind: ContentKindsNames.TOPIC },
+];
+
+let store;
+let contentNodeActions;
+let generalActions;
+
+const makeWrapper = nodeIds => {
+  return mount(EditLanguageModal, {
+    store,
+    propsData: {
+      nodeIds,
+      resourcesSelectedText: '2 resources',
+    },
+  });
+};
+
+describe('EditLanguageModal', () => {
+  beforeEach(() => {
+    contentNodeActions = {
+      updateContentNode: jest.fn(),
+      updateContentNodeDescendants: jest.fn(),
+    };
+    generalActions = {
+      showSnackbarSimple: jest.fn(),
+    };
+    store = new Vuex.Store({
+      actions: generalActions,
+      modules: {
+        contentNode: {
+          namespaced: true,
+          actions: contentNodeActions,
+          getters: {
+            getContentNodes: () => ids => nodes.filter(node => ids.includes(node.id)),
+          },
+        },
+      },
+    });
+  });
+
+  test('smoke test', () => {
+    const wrapper = makeWrapper(['test-en-res']);
+    expect(wrapper.isVueInstance()).toBe(true);
+  });
+
+  describe('Selected language on first render', () => {
+    test('no language should be selected if a single node does not have a language', () => {
+      const wrapper = makeWrapper(['test-nolang-res']);
+
+      const checkboxes = wrapper.findAll('input[type="radio"]');
+      checkboxes.wrappers.forEach(checkbox => {
+        expect(checkbox.element.checked).toBeFalsy();
+      });
+    });
+
+    test('no language should be selected if just a single node among multiple nodes does not have language', () => {
+      const wrapper = makeWrapper(['test-en-res', 'test-nolang-res']);
+
+      const checkboxes = wrapper.findAll('input[type="radio"]');
+      checkboxes.wrappers.forEach(checkbox => {
+        expect(checkbox.element.checked).toBeFalsy();
+      });
+    });
+
+    test('no language should be selected if there are multiple languages set', () => {
+      const wrapper = makeWrapper(['test-en-res', 'test-es-res']);
+
+      const checkboxes = wrapper.findAll('input[type="radio"]');
+      checkboxes.wrappers.forEach(checkbox => {
+        expect(checkbox.element.checked).toBeFalsy();
+      });
+    });
+
+    test('the common language should be selected if all nodes have the same language', () => {
+      const wrapper = makeWrapper(['test-en-res', 'test-en-topic']);
+
+      const checkbox = wrapper.find('input[value="en"]');
+      expect(checkbox.element.checked).toBeTruthy();
+    });
+  });
+
+  test('should render the message of the number of resources selected', () => {
+    const wrapper = makeWrapper(['test-en-res', 'test-es-res']);
+
+    const resourcesCounter = wrapper.find('[data-test="resources-selected-message"]');
+    expect(resourcesCounter.exists()).toBeTruthy();
+    expect(resourcesCounter.text()).toContain('2');
+  });
+
+  test('should render the message of the number of resources selected - 2', () => {
+    const wrapper = makeWrapper(['test-en-res', 'test-es-res', 'test-en-topic', 'test-nolang-res']);
+
+    const resourcesCounter = wrapper.find('[data-test="resources-selected-message"]');
+    expect(resourcesCounter.exists()).toBeTruthy();
+    expect(resourcesCounter.text()).toContain('2 resources');
+  });
+
+  test('should filter languages options based on search query', () => {
+    const wrapper = makeWrapper(['test-en-topic']);
+
+    wrapper.find('[data-test="search-input"]').vm.$emit('input', 'es');
+
+    const optionsList = wrapper.find('[data-test="language-options-list"]');
+    const options = optionsList.findAll('input[type="radio"]');
+    options.wrappers.forEach(option => {
+      const language = LanguagesList.find(lang => lang.id === option.element.value);
+      expect(
+        language.id.toLowerCase().includes('es') ||
+          language.native_name.toLowerCase().includes('es') ||
+          language.readable_name.toLowerCase().includes('es')
+      ).toBeTruthy();
+    });
+  });
+
+  test('should display information message about different languages if there are multiple languages set', () => {
+    const wrapper = makeWrapper(['test-en-res', 'test-es-res']);
+
+    expect(wrapper.find('[data-test="different-languages-message"]').exists()).toBeTruthy();
+  });
+
+  test('shouldnt display information message about different languages if only one language is set', () => {
+    const wrapper = makeWrapper(['test-en-res', 'test-en-topic']);
+
+    expect(wrapper.find('[data-test="different-languages-message"]').exists()).toBeFalsy();
+  });
+
+  test('the submit button should be disabled if no language is selected', () => {
+    const wrapper = makeWrapper(['test-en-res', 'test-es-res']);
+
+    const buttons = wrapper.findAll('button').wrappers;
+    const submitButton = buttons.find(button => button.text() === 'Save');
+
+    expect(submitButton.element.disabled).toBeTruthy();
+  });
+
+  test('the submit button should be enabled if a language is selected', () => {
+    const wrapper = makeWrapper(['test-en-res', 'test-es-res']);
+
+    const buttons = wrapper.findAll('button').wrappers;
+    const submitButton = buttons.find(button => button.text() === 'Save');
+
+    wrapper.find('input[value="en"]').setChecked(true);
+
+    expect(submitButton.element.disabled).toBeFalsy();
+  });
+
+  test('should call updateContentNode with the right language on success submit', () => {
+    const wrapper = makeWrapper(['test-en-res']);
+
+    wrapper.find('input[value="en"]').setChecked(true);
+    wrapper.find('[data-test="edit-language-modal"]').vm.$emit('submit');
+
+    const animationFrameId = requestAnimationFrame(() => {
+      expect(contentNodeActions.updateContentNode).toHaveBeenCalledWith(expect.anything(), {
+        id: 'test-es-res',
+        language: 'en',
+      });
+      expect(contentNodeActions.updateContentNode).toHaveBeenCalledWith(expect.anything(), {
+        id: 'test-en-res',
+        language: 'en',
+      });
+      cancelAnimationFrame(animationFrameId);
+    });
+  });
+
+  test('should emit close event on success submit', () => {
+    const wrapper = makeWrapper(['test-en-res']);
+
+    wrapper.find('input[value="en"]').setChecked(true);
+    wrapper.find('[data-test="edit-language-modal"]').vm.$emit('submit');
+
+    const animationFrameId = requestAnimationFrame(() => {
+      expect(wrapper.emitted('close')).toBeTruthy();
+      cancelAnimationFrame(animationFrameId);
+    });
+  });
+
+  test('should emit close event on cancel', () => {
+    const wrapper = makeWrapper(['test-en-res']);
+
+    wrapper.find('[data-test="edit-language-modal"]').vm.$emit('cancel');
+
+    const animationFrameId = requestAnimationFrame(() => {
+      expect(wrapper.emitted('close')).toBeTruthy();
+      cancelAnimationFrame(animationFrameId);
+    });
+  });
+
+  test('should show a confirmation snackbar on success submit', () => {
+    const wrapper = makeWrapper(['test-en-res']);
+
+    wrapper.find('input[value="en"]').setChecked(true);
+    wrapper.find('[data-test="edit-language-modal"]').vm.$emit('submit');
+
+    const animationFrameId = requestAnimationFrame(() => {
+      expect(generalActions.showSnackbarSimple).toHaveBeenCalled();
+      cancelAnimationFrame(animationFrameId);
+    });
+  });
+
+  describe('topic nodes present', () => {
+    test('should display the checkbox to apply change to descendants if a topic is present', () => {
+      const wrapper = makeWrapper(['test-en-topic', 'test-en-res']);
+
+      expect(wrapper.find('[data-test="update-descendants-checkbox"]').exists()).toBeTruthy();
+    });
+
+    test('should not display the checkbox to apply change to descendants if a topic is not present', () => {
+      const wrapper = makeWrapper(['test-en-res']);
+
+      expect(wrapper.find('[data-test="update-descendants-checkbox"]').exists()).toBeFalsy();
+    });
+
+    test('should call updateContentNode with the right language on success submit if the user does not check the checkbox', () => {
+      const wrapper = makeWrapper(['test-en-topic', 'test-en-res']);
+
+      wrapper.find('input[value="es"]').setChecked(true);
+      wrapper.find('[data-test="edit-language-modal"]').vm.$emit('submit');
+
+      const animationFrameId = requestAnimationFrame(() => {
+        expect(contentNodeActions.updateContentNode).toHaveBeenCalledWith(expect.anything(), {
+          id: 'test-en-topic',
+          language: 'es',
+        });
+        cancelAnimationFrame(animationFrameId);
+      });
+    });
+
+    test('should call updateContentNodeDescendants with the right language on success submit if the user checks the checkbox', () => {
+      const wrapper = makeWrapper(['test-en-topic', 'test-en-res']);
+
+      wrapper.find('input[value="es"]').setChecked(true);
+      wrapper.find('[data-test="update-descendants-checkbox"] input').setChecked(true);
+      wrapper.find('[data-test="edit-language-modal"]').vm.$emit('submit');
+
+      const animationFrameId = requestAnimationFrame(() => {
+        expect(contentNodeActions.updateContentNodeDescendants).toHaveBeenCalledWith(
+          expect.anything(),
+          {
+            id: 'test-en-topic',
+            language: 'es',
+          }
+        );
+        cancelAnimationFrame(animationFrameId);
+      });
+    });
+  });
+});
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/__tests__/EditSourceModal.spec.js b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/__tests__/EditSourceModal.spec.js
new file mode 100644
index 0000000000..ae88d106ef
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/__tests__/EditSourceModal.spec.js
@@ -0,0 +1,311 @@
+import { mount } from '@vue/test-utils';
+import Vuex from 'vuex';
+import EditSourceModal from '../EditSourceModal';
+import { LicensesList } from 'shared/leUtils/Licenses';
+import { constantsTranslationMixin } from 'shared/mixins';
+
+let nodes;
+
+let store;
+let contentNodeActions;
+let generalActions;
+let generalGetters;
+
+const MIXED_VALUE = 'Mixed';
+
+const getLicenseId = translatedLicense => {
+  if (translatedLicense === MIXED_VALUE) {
+    return MIXED_VALUE;
+  }
+  const translatedLicenses = LicensesList.reduce((acc, license) => {
+    const { translateConstant } = constantsTranslationMixin.methods;
+    acc[translateConstant(license.license_name)] = license.id;
+    return acc;
+  }, {});
+  return translatedLicenses[translatedLicense];
+};
+
+const getSourceValues = wrapper => {
+  return {
+    author: wrapper.find('[data-test="author-input"] input').element.value,
+    provider: wrapper.find('[data-test="provider-input"] input').element.value,
+    aggregator: wrapper.find('[data-test="aggregator-input"] input').element.value,
+    license: getLicenseId(wrapper.find('.v-select__selections').element.textContent),
+    license_description: wrapper.find('.license-description textarea')?.element?.value,
+    copyright_holder: wrapper.find('[data-test="copyright-holder-input"] input').element.value,
+  };
+};
+
+const makeWrapper = nodeIds => {
+  return mount(EditSourceModal, {
+    store,
+    propsData: {
+      nodeIds,
+      resourcesSelectedText: '2 resources',
+    },
+  });
+};
+
+describe('EditSourceModal', () => {
+  beforeEach(() => {
+    nodes = {
+      node1: {
+        id: 'node1',
+        copyright_holder: 'Test',
+      },
+      node2: {
+        id: 'node2',
+        copyright_holder: 'Test',
+      },
+    };
+    contentNodeActions = {
+      updateContentNode: jest.fn(),
+    };
+    generalActions = {
+      showSnackbarSimple: jest.fn(),
+    };
+    generalGetters = {
+      isAboutLicensesModalOpen: () => false,
+    };
+    store = new Vuex.Store({
+      actions: generalActions,
+      getters: generalGetters,
+      modules: {
+        contentNode: {
+          namespaced: true,
+          actions: contentNodeActions,
+          getters: {
+            getContentNodes: () => ids => ids.map(id => nodes[id]),
+          },
+        },
+      },
+    });
+  });
+
+  test('smoke test', () => {
+    const wrapper = makeWrapper(['node1']);
+    expect(wrapper.isVueInstance()).toBe(true);
+  });
+
+  describe('Selected source on first render', () => {
+    test('should display the correct source values when one node is selected', () => {
+      const testValues = {
+        author: 'Test author',
+        provider: 'Test provider',
+        aggregator: 'Test aggregator',
+        license: 9,
+        license_description: 'Test license description',
+        copyright_holder: 'Test copyright',
+      };
+      Object.assign(nodes.node1, testValues);
+      const wrapper = makeWrapper(['node1']);
+
+      expect(getSourceValues(wrapper)).toEqual(expect.anything(), testValues);
+    });
+
+    test('should display the common source values when multiple nodes are selected', () => {
+      const testValues = {
+        author: 'Test author',
+        provider: 'Test provider',
+      };
+      Object.assign(nodes.node1, testValues);
+      Object.assign(nodes.node2, testValues);
+
+      const wrapper = makeWrapper(['node1', 'node2']);
+
+      expect(getSourceValues(wrapper)).toEqual(expect.anything(), testValues);
+    });
+
+    test('should display the mixed value when the selected nodes have different values', () => {
+      nodes['node1'].author = 'Test author';
+      nodes['node2'].author = 'Test author 2';
+
+      const wrapper = makeWrapper(['node1', 'node2']);
+
+      const sourceValues = getSourceValues(wrapper);
+      expect(sourceValues.author).toEqual(MIXED_VALUE);
+    });
+
+    test('should disable inputs when all nodes are imported', () => {
+      nodes['node1'].original_source_node_id = 'original_node1';
+      nodes['node2'].original_source_node_id = 'original_node2';
+
+      const wrapper = makeWrapper(['node1', 'node2']);
+
+      expect(wrapper.find('[data-test="author-input"] input').element.disabled).toBe(true);
+      expect(wrapper.find('[data-test="provider-input"] input').element.disabled).toBe(true);
+      expect(wrapper.find('[data-test="aggregator-input"] input').element.disabled).toBe(true);
+      expect(wrapper.find('[data-test="copyright-holder-input"] input').element.disabled).toBe(
+        true
+      );
+    });
+
+    test('should show message that source cannot be edited when all nodes are imported', () => {
+      nodes['node1'].original_source_node_id = 'original_node1';
+      nodes['node2'].original_source_node_id = 'original_node2';
+
+      const wrapper = makeWrapper(['node1', 'node2']);
+
+      expect(wrapper.find('.help').text()).toContain('Cannot edit');
+    });
+
+    test('should disable inputs when node has freeze_authoring_data set to true', () => {
+      nodes['node1'].freeze_authoring_data = true;
+
+      const wrapper = makeWrapper(['node1']);
+
+      expect(wrapper.find('[data-test="author-input"] input').element.disabled).toBe(true);
+      expect(wrapper.find('[data-test="provider-input"] input').element.disabled).toBe(true);
+      expect(wrapper.find('[data-test="aggregator-input"] input').element.disabled).toBe(true);
+      expect(wrapper.find('[data-test="copyright-holder-input"] input').element.disabled).toBe(
+        true
+      );
+    });
+
+    test('should show message that source cannot be edited when node has freeze_authoring_data set to true', () => {
+      nodes['node1'].freeze_authoring_data = true;
+
+      const wrapper = makeWrapper(['node1']);
+
+      expect(wrapper.find('.help').text()).toContain('Cannot edit');
+    });
+
+    test('should not disable inputs when not all nodes are imported', () => {
+      nodes['node1'].original_source_node_id = 'original_node1';
+
+      const wrapper = makeWrapper(['node1', 'node2']);
+
+      expect(wrapper.find('[data-test="author-input"] input').element.disabled).toBe(false);
+      expect(wrapper.find('[data-test="provider-input"] input').element.disabled).toBe(false);
+      expect(wrapper.find('[data-test="aggregator-input"] input').element.disabled).toBe(false);
+      expect(wrapper.find('[data-test="copyright-holder-input"] input').element.disabled).toBe(
+        false
+      );
+    });
+
+    test('should show a message that edits will be reflected only for local resources if just some nodes are imported, but not all', () => {
+      nodes['node1'].original_source_node_id = 'original_node1';
+
+      const wrapper = makeWrapper(['node1', 'node2']);
+
+      expect(wrapper.find('.help').text()).toContain(
+        'Edits will be reflected only for local resources'
+      );
+    });
+  });
+
+  describe('On submit', () => {
+    test('should not call updateContentNode on submit if copyright holder is missing', () => {
+      nodes['node1'].copyright_holder = '';
+      const wrapper = makeWrapper(['node1']);
+      wrapper.find('[data-test="edit-source-modal"]').vm.$emit('submit');
+
+      expect(contentNodeActions.updateContentNode).not.toHaveBeenCalled();
+    });
+
+    test('should call updateContentNode on success submit for all editable nodes', () => {
+      const wrapper = makeWrapper(['node1', 'node2']);
+      wrapper.find('[data-test="edit-source-modal"]').vm.$emit('submit');
+
+      expect(contentNodeActions.updateContentNode).toHaveBeenCalled();
+    });
+
+    test('should call updateContentNode with the correct parameters on success submit for all editable nodes', () => {
+      nodes['node1'].author = 'Test author';
+      const newAuthor = 'new-author';
+
+      const wrapper = makeWrapper(['node1', 'node2']);
+      wrapper.find('[data-test="author-input"]').vm.$emit('input', newAuthor);
+      wrapper.find('[data-test="edit-source-modal"]').vm.$emit('submit');
+
+      expect(contentNodeActions.updateContentNode).toHaveBeenCalledWith(
+        expect.anything(),
+        expect.objectContaining({
+          id: 'node1',
+          author: newAuthor,
+        })
+      );
+    });
+
+    test('should call updateContentNode on submit just for the editable nodes', () => {
+      nodes['node1'].original_source_node_id = 'original_node1';
+      const wrapper = makeWrapper(['node1', 'node2']);
+      wrapper.find('[data-test="edit-source-modal"]').vm.$emit('submit');
+
+      expect(contentNodeActions.updateContentNode).toHaveBeenCalledTimes(1);
+      expect(contentNodeActions.updateContentNode).toHaveBeenCalledWith(
+        expect.anything(),
+        expect.objectContaining({
+          id: 'node2',
+        })
+      );
+      expect(contentNodeActions.updateContentNode).not.toHaveBeenCalledWith(
+        expect.anything(),
+        expect.objectContaining({
+          id: 'node1',
+        })
+      );
+    });
+
+    test('should not call updateContentNode on submit if all nodes are imported', () => {
+      nodes['node1'].original_source_node_id = 'original_node1';
+      nodes['node2'].original_source_node_id = 'original_node2';
+      const wrapper = makeWrapper(['node1', 'node2']);
+      wrapper.find('[data-test="edit-source-modal"]').vm.$emit('submit');
+
+      expect(contentNodeActions.updateContentNode).not.toHaveBeenCalled();
+    });
+
+    test('should show a snackbar with the correct number of edited nodes on success submit', () => {
+      const wrapper = makeWrapper(['node1', 'node2']);
+      wrapper.find('[data-test="edit-source-modal"]').vm.$emit('submit');
+
+      const animationFrameId = requestAnimationFrame(() => {
+        expect(generalActions.showSnackbarSimple).toHaveBeenCalledWith(
+          expect.anything(),
+          'Edited attribution for 2 resources'
+        );
+        cancelAnimationFrame(animationFrameId);
+      });
+    });
+
+    test('should show a snack bar with the correct number of edited nodes on success submit if some nodes are imported', () => {
+      nodes['node1'].original_source_node_id = 'original_node1';
+      const wrapper = makeWrapper(['node1', 'node2']);
+      wrapper.find('[data-test="edit-source-modal"]').vm.$emit('submit');
+
+      const animationFrameId = requestAnimationFrame(() => {
+        expect(generalActions.showSnackbarSimple).toHaveBeenCalledWith(
+          expect.anything(),
+          'Edited attribution for 1 resource'
+        );
+        cancelAnimationFrame(animationFrameId);
+      });
+    });
+
+    test('should emit close event on success submit', () => {
+      const wrapper = makeWrapper(['node1', 'node2']);
+      wrapper.find('[data-test="edit-source-modal"]').vm.$emit('submit');
+
+      const animationFrameId = requestAnimationFrame(() => {
+        expect(wrapper.emitted('close')).toBeTruthy();
+        cancelAnimationFrame(animationFrameId);
+      });
+    });
+  });
+
+  test('should render the message of the number of resources selected', () => {
+    const wrapper = makeWrapper(['node1', 'node2']);
+
+    const resourcesCounter = wrapper.find('[data-test="resources-selected-message"]');
+    expect(resourcesCounter.exists()).toBeTruthy();
+    expect(resourcesCounter.text()).toContain('2');
+  });
+
+  test('should emit close event on cancel', () => {
+    const wrapper = makeWrapper(['node1', 'node2']);
+
+    wrapper.find('[data-test="edit-source-modal"]').vm.$emit('cancel');
+    expect(wrapper.emitted('close')).toBeTruthy();
+  });
+});
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/__tests__/EditTitleDescriptionModal.spec.js b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/__tests__/EditTitleDescriptionModal.spec.js
new file mode 100644
index 0000000000..2c20379601
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/__tests__/EditTitleDescriptionModal.spec.js
@@ -0,0 +1,190 @@
+import { mount } from '@vue/test-utils';
+import Vuex from 'vuex';
+import EditTitleDescriptionModal from '../EditTitleDescriptionModal.vue';
+
+const nodeId = 'test-id';
+
+const node = {
+  id: nodeId,
+  title: 'test-title',
+  description: 'test-description',
+};
+
+let store;
+let contentNodeActions;
+let generalActions;
+
+describe('EditTitleDescriptionModal', () => {
+  beforeEach(() => {
+    contentNodeActions = {
+      updateContentNode: jest.fn(),
+    };
+    generalActions = {
+      showSnackbarSimple: jest.fn(),
+    };
+    store = new Vuex.Store({
+      actions: generalActions,
+      modules: {
+        contentNode: {
+          namespaced: true,
+          actions: contentNodeActions,
+          getters: {
+            getContentNode: () => () => node,
+          },
+        },
+      },
+    });
+  });
+
+  test('smoke test', () => {
+    const wrapper = mount(EditTitleDescriptionModal, {
+      store,
+      propsData: {
+        nodeId,
+      },
+    });
+    expect(wrapper.isVueInstance()).toBe(true);
+  });
+
+  test('should display the correct title and description on first render', () => {
+    const wrapper = mount(EditTitleDescriptionModal, {
+      store,
+      propsData: {
+        nodeId,
+      },
+    });
+
+    expect(wrapper.find('[data-test="title-input"]').vm.$props.value).toBe(node.title);
+    expect(wrapper.find('[data-test="description-input"]').vm.$props.value).toBe(node.description);
+  });
+
+  test('should call updateContentNode on success submit', () => {
+    const wrapper = mount(EditTitleDescriptionModal, {
+      store,
+      propsData: {
+        nodeId,
+      },
+    });
+
+    wrapper.find('[data-test="edit-title-description-modal"]').vm.$emit('submit');
+    expect(contentNodeActions.updateContentNode).toHaveBeenCalled();
+  });
+
+  test('should call updateContentNode with the correct parameters on success submit', () => {
+    const wrapper = mount(EditTitleDescriptionModal, {
+      store,
+      propsData: {
+        nodeId,
+      },
+    });
+
+    const newTitle = 'new-title';
+    const newDescription = 'new-description';
+    wrapper.find('[data-test="title-input"]').vm.$emit('input', 'new-title');
+    wrapper.find('[data-test="description-input"]').vm.$emit('input', 'new-description');
+
+    wrapper.find('[data-test="edit-title-description-modal"]').vm.$emit('submit');
+
+    expect(contentNodeActions.updateContentNode).toHaveBeenCalledWith(expect.anything(), {
+      id: nodeId,
+      title: newTitle,
+      description: newDescription,
+    });
+  });
+
+  test('should let update even if description is empty', () => {
+    const wrapper = mount(EditTitleDescriptionModal, {
+      store,
+      propsData: {
+        nodeId,
+      },
+    });
+
+    const newTitle = 'new-title';
+    wrapper.find('[data-test="title-input"]').vm.$emit('input', 'new-title');
+    wrapper.find('[data-test="description-input"]').vm.$emit('input', '');
+
+    wrapper.find('[data-test="edit-title-description-modal"]').vm.$emit('submit');
+
+    expect(contentNodeActions.updateContentNode).toHaveBeenCalledWith(expect.anything(), {
+      id: nodeId,
+      title: newTitle,
+      description: '',
+    });
+  });
+
+  test('should validate title on blur', () => {
+    const wrapper = mount(EditTitleDescriptionModal, {
+      store,
+      propsData: {
+        nodeId,
+      },
+    });
+
+    wrapper.find('[data-test="title-input"]').vm.$emit('input', '');
+    wrapper.find('[data-test="title-input"]').vm.$emit('blur');
+
+    expect(wrapper.find('[data-test="title-input"]').vm.$props.invalidText).toBeTruthy();
+  });
+
+  test('should validate title on submit', () => {
+    const wrapper = mount(EditTitleDescriptionModal, {
+      store,
+      propsData: {
+        nodeId,
+      },
+    });
+
+    wrapper.find('[data-test="title-input"]').vm.$emit('input', '');
+    wrapper.find('[data-test="edit-title-description-modal"]').vm.$emit('submit');
+
+    expect(wrapper.find('[data-test="title-input"]').vm.$props.invalidText).toBeTruthy();
+  });
+
+  test("should show 'Edited title and description' on a snackbar on success submit", () => {
+    const wrapper = mount(EditTitleDescriptionModal, {
+      store,
+      propsData: {
+        nodeId,
+      },
+    });
+
+    wrapper.find('[data-test="edit-title-description-modal"]').vm.$emit('submit');
+
+    const animationFrameId = requestAnimationFrame(() => {
+      expect(generalActions.showSnackbarSimple).toHaveBeenCalledWith(
+        expect.anything(),
+        'Edited title and description'
+      );
+      cancelAnimationFrame(animationFrameId);
+    });
+  });
+
+  test("should emit 'close' event on success submit", () => {
+    const wrapper = mount(EditTitleDescriptionModal, {
+      store,
+      propsData: {
+        nodeId,
+      },
+    });
+
+    wrapper.find('[data-test="edit-title-description-modal"]').vm.$emit('submit');
+
+    const animationFrameId = requestAnimationFrame(() => {
+      expect(wrapper.emitted().close).toBeTruthy();
+      cancelAnimationFrame(animationFrameId);
+    });
+  });
+
+  test('should emit close event on cancel', () => {
+    const wrapper = mount(EditTitleDescriptionModal, {
+      store,
+      propsData: {
+        nodeId,
+      },
+    });
+
+    wrapper.find('[data-test="edit-title-description-modal"]').vm.$emit('cancel');
+    expect(wrapper.emitted().close).toBeTruthy();
+  });
+});
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/index.vue b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/index.vue
new file mode 100644
index 0000000000..7496cd8a4d
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/index.vue
@@ -0,0 +1,162 @@
+<template>
+
+  <div>
+    <EditTitleDescriptionModal
+      v-if="isTitleDescriptionOpen"
+      :nodeId="nodeIds[0]"
+      @close="close"
+    />
+    <EditLanguageModal
+      v-if="isLanguageOpen"
+      :nodeIds="nodeIds"
+      :resourcesSelectedText="displayedResourceSelectedText"
+      @close="close"
+    />
+    <EditResourcesNeededModal
+      v-if="isResourcesNeededOpen"
+      :nodeIds="nodeIds"
+      :resourcesSelectedText="displayedResourceSelectedText"
+      @close="close"
+    />
+    <EditCategoriesModal
+      v-if="isCategoriesOpen"
+      :nodeIds="nodeIds"
+      :resourcesSelectedText="displayedResourceSelectedText"
+      @close="close"
+    />
+    <EditLevelsModal
+      v-if="isLevelsOpen"
+      :nodeIds="nodeIds"
+      :resourcesSelectedText="displayedResourceSelectedText"
+      @close="close"
+    />
+    <EditLearningActivitiesModal
+      v-if="isLearningActivitiesOpen"
+      :nodeIds="nodeIds"
+      :resourcesSelectedText="displayedResourceSelectedText"
+      @close="close"
+    />
+    <EditSourceModal
+      v-if="isEditSourceOpen"
+      :nodeIds="nodeIds"
+      :resourcesSelectedText="displayedResourceSelectedText"
+      @close="close"
+    />
+    <EditAudienceModal
+      v-if="isAudienceOpen"
+      :nodeIds="nodeIds"
+      :resourcesSelectedText="displayedResourceSelectedText"
+      @close="close"
+    />
+    <EditCompletionModal
+      v-if="isCompletionOpen"
+      :nodeId="nodeIds[0]"
+      @close="close"
+    />
+  </div>
+
+</template>
+
+
+<script>
+
+  import { mapGetters, mapActions } from 'vuex';
+  import { QuickEditModals } from '../../constants';
+  import messages from '../../translator';
+  import EditSourceModal from './EditSourceModal';
+  import EditLevelsModal from './EditLevelsModal';
+  import EditLanguageModal from './EditLanguageModal';
+  import EditAudienceModal from './EditAudienceModal';
+  import EditCategoriesModal from './EditCategoriesModal';
+  import EditCompletionModal from './EditCompletionModal';
+  import EditResourcesNeededModal from './EditResourcesNeededModal';
+  import EditTitleDescriptionModal from './EditTitleDescriptionModal';
+  import EditLearningActivitiesModal from './EditLearningActivitiesModal.vue';
+
+  export default {
+    name: 'QuickEditModal',
+    components: {
+      EditSourceModal,
+      EditLevelsModal,
+      EditLanguageModal,
+      EditAudienceModal,
+      EditCategoriesModal,
+      EditCompletionModal,
+      EditResourcesNeededModal,
+      EditTitleDescriptionModal,
+      EditLearningActivitiesModal,
+    },
+    computed: {
+      ...mapGetters('contentNode', [
+        'getQuickEditModalOpen',
+        'getSelectedTopicAndResourceCountText',
+      ]),
+      openedModal() {
+        const quickEditModal = this.getQuickEditModalOpen();
+        if (!quickEditModal) {
+          return null;
+        }
+        return quickEditModal.modal;
+      },
+      nodeIds() {
+        const quickEditModal = this.getQuickEditModalOpen();
+        if (!quickEditModal) {
+          return [];
+        }
+        return quickEditModal.nodeIds;
+      },
+      resourcesSelectedText() {
+        return this.getSelectedTopicAndResourceCountText(this.nodeIds);
+      },
+      singleResourceSelected() {
+        return (
+          this.resourcesSelectedText ===
+          // eslint-disable-next-line kolibri/vue-no-undefined-string-uses
+          messages.$tr('selectionCount', { topicCount: 0, resourceCount: 1 })
+        );
+      },
+      displayedResourceSelectedText() {
+        return this.singleResourceSelected ? '' : this.resourcesSelectedText;
+      },
+      isTitleDescriptionOpen() {
+        return this.openedModal === QuickEditModals.TITLE_DESCRIPTION;
+      },
+      isLanguageOpen() {
+        return this.openedModal === QuickEditModals.LANGUAGE;
+      },
+      isResourcesNeededOpen() {
+        return this.openedModal === QuickEditModals.WHAT_IS_NEEDED;
+      },
+      isCategoriesOpen() {
+        return this.openedModal === QuickEditModals.CATEGORIES;
+      },
+      isLevelsOpen() {
+        return this.openedModal === QuickEditModals.LEVELS;
+      },
+      isLearningActivitiesOpen() {
+        return this.openedModal === QuickEditModals.LEARNING_ACTIVITIES;
+      },
+      isEditSourceOpen() {
+        return this.openedModal === QuickEditModals.SOURCE;
+      },
+      isAudienceOpen() {
+        return this.openedModal === QuickEditModals.AUDIENCE;
+      },
+      isCompletionOpen() {
+        return this.openedModal === QuickEditModals.COMPLETION;
+      },
+    },
+    methods: {
+      ...mapActions('contentNode', ['setQuickEditModal']),
+      close() {
+        this.setQuickEditModal(null);
+      },
+    },
+  };
+
+</script>
+
+
+<style lang="scss" scoped>
+
+</style>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/ResourcePanel.vue b/contentcuration/contentcuration/frontend/channelEdit/components/ResourcePanel.vue
index 393872f8bb..b2ae91a2ea 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/ResourcePanel.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/ResourcePanel.vue
@@ -817,7 +817,7 @@
         }
       },
       category(options) {
-        const ids = Object.keys(options || []);
+        const ids = Object.keys(options || {});
         const matches = Object.keys(Categories)
           .sort()
           .filter(k => ids.includes(Categories[k]));
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/StudioTree/StudioTree.vue b/contentcuration/contentcuration/frontend/channelEdit/components/StudioTree/StudioTree.vue
index 4b7986a2bc..f72a3f6d0e 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/StudioTree/StudioTree.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/StudioTree/StudioTree.vue
@@ -130,6 +130,7 @@
                       />
                       <Menu
                         v-else
+                        v-model="showMenu"
                         data-test="editMenu"
                       >
                         <template #activator="{ on }">
@@ -141,7 +142,7 @@
                             @click.stop
                           />
                         </template>
-                        <ContentNodeOptions :nodeId="nodeId" />
+                        <ContentNodeOptions v-if="showMenu" :nodeId="nodeId" />
                       </Menu>
                     </VFlex>
                     <ContentNodeContextMenu
@@ -263,6 +264,7 @@
         draggableSize: 5,
         draggableExpanded: false,
         debouncedLoad: null,
+        showMenu: false,
       };
     },
     computed: {
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/CategoryOptions.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/CategoryOptions.vue
deleted file mode 100644
index b14c11a839..0000000000
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/CategoryOptions.vue
+++ /dev/null
@@ -1,221 +0,0 @@
-<template>
-
-  <DropdownWrapper>
-    <template #default="{ attach, menuProps }">
-      <VAutocomplete
-        :value="selected"
-        :items="categoriesList"
-        :searchInput.sync="categoryText"
-        :label="translateMetadataString('category')"
-        box
-        clearable
-        chips
-        deletableChips
-        multiple
-        item-value="value"
-        item-text="text"
-        :menu-props="{ ...menuProps, zIndex: 4 }"
-        :attach="attach"
-        @click:clear="$nextTick(() => removeAll())"
-      >
-        <template #selection="data">
-          <VTooltip bottom lazy>
-            <template #activator="{ on, attrs }">
-              <VChip v-bind="attrs" close v-on="on" @input="remove(data.item.value)">
-                {{ data.item.text }}
-              </VChip>
-            </template>
-            <div>
-              <div>{{ tooltipHelper(data.item.value) }}</div>
-            </div>
-          </VTooltip>
-        </template>
-
-        <template #no-data>
-          <VListTile v-if="categoryText && categoryText.trim()">
-            <VListTileContent>
-              <VListTileTitle>
-                {{ $tr('noCategoryFoundText', { text: categoryText.trim() }) }}
-              </VListTileTitle>
-            </VListTileContent>
-          </VListTile>
-        </template>
-
-        <template #item="{ item }">
-          <VListTile
-            :value="isSelected(item.value)"
-            :class="{ parentOption: !item.value.includes('.') }"
-            @mousedown.prevent
-            @click="() => !isSelected(item.value) ? add(item.value) : remove(item.value)"
-          >
-            <KCheckbox
-              :checked="isSelected(item.value)"
-              :label="item.text"
-              :value="item.value"
-              style="margin-top: 10px"
-              :style="treeItemStyle(item)"
-              :ripple="false"
-            />
-          </VListTile>
-        </template>
-      </VAutocomplete>
-    </template>
-  </DropdownWrapper>
-
-</template>
-
-<script>
-
-  import camelCase from 'lodash/camelCase';
-  import { constantsTranslationMixin, metadataTranslationMixin } from 'shared/mixins';
-  import { Categories, CategoriesLookup } from 'shared/constants';
-  import DropdownWrapper from 'shared/views/form/DropdownWrapper';
-
-  const availablePaths = {};
-  const categoriesObj = {};
-  const dropdown = [];
-
-  Object.assign(availablePaths, CategoriesLookup);
-
-  /*
-   * This is used to create the categories object from which the dropdown list is generated
-   * and is the same as this to make sure the order in Kolibri and Studio are the same:
-   * https://github.com/learningequality/kolibri/blob/develop/kolibri/plugins/learn/assets/
-   *   src/views/CategorySearchModal/CategorySearchOptions.vue#L73
-   */
-  for (const subjectKey of Object.entries(Categories)
-    .sort((a, b) => a[1].length - b[1].length)
-    .map(a => a[0])) {
-    const ids = Categories[subjectKey].split('.');
-
-    let path = '';
-    let nested = categoriesObj;
-    for (const fragment of ids) {
-      path += fragment;
-      if (availablePaths[path]) {
-        const nestedKey = CategoriesLookup[path];
-        if (!nested[nestedKey]) {
-          nested[nestedKey] = {
-            value: path,
-            nested: {},
-          };
-        }
-        nested = nested[nestedKey].nested;
-        path += '.';
-      } else {
-        break;
-      }
-    }
-  }
-
-  const flattenCategories = obj => {
-    Object.keys(obj).forEach(key => {
-      if (key !== 'value' && key !== 'nested') {
-        dropdown.push({
-          text: key,
-          value: obj[key]['value'],
-        });
-      }
-      if (typeof obj[key] === 'object') {
-        flattenCategories(obj[key]);
-      }
-    });
-    return dropdown;
-  };
-
-  flattenCategories(categoriesObj);
-
-  export default {
-    name: 'CategoryOptions',
-    components: { DropdownWrapper },
-    mixins: [constantsTranslationMixin, metadataTranslationMixin],
-    props: {
-      value: {
-        type: Array,
-        default: () => [],
-      },
-    },
-    data() {
-      return {
-        categoryText: null,
-      };
-    },
-    computed: {
-      categoriesList() {
-        return dropdown.map(category => {
-          return {
-            ...category,
-            text: this.translateMetadataString(camelCase(category.text)),
-            level: this.findDepth(Categories[category.text]),
-          };
-        });
-      },
-      selected: {
-        get() {
-          return this.value;
-        },
-        set(value) {
-          this.$emit('input', value);
-        },
-      },
-      nested() {
-        return !this.categoryText;
-      },
-      isSelected() {
-        return value => this.selected.some(v => v.startsWith(value));
-      },
-    },
-    methods: {
-      treeItemStyle(item) {
-        const rule = this.$isRTL ? 'paddingRight' : 'paddingLeft';
-        return this.nested ? { [rule]: `${item.level * 24}px` } : {};
-      },
-      add(value) {
-        this.selected = [...this.selected, value];
-      },
-      remove(value) {
-        this.selected = this.selected.filter(i => !i.startsWith(value));
-      },
-      removeAll() {
-        this.selected = [];
-      },
-      tooltipHelper(id) {
-        return this.displayFamilyTree(dropdown, id)
-          .map(node => this.translateMetadataString(camelCase(node.text)))
-          .join(' - ');
-      },
-      findDepth(val) {
-        return val.split('.').length - 1;
-      },
-      displayFamilyTree(nodes, id) {
-        return nodes.filter(node => this.findFamilyTreeIds(id).includes(node.value));
-      },
-      /**
-       * @param {String} id The id of the selected category
-       * @returns {Array} An array of all ids of the family beginning with the selected category
-       */
-      findFamilyTreeIds(id) {
-        const family = [];
-        let familyMember = id;
-        while (familyMember) {
-          family.push(familyMember);
-          familyMember = familyMember.includes('.')
-            ? familyMember.substring(0, familyMember.lastIndexOf('.'))
-            : null;
-        }
-        return family;
-      },
-    },
-    $trs: {
-      noCategoryFoundText: 'Category not found',
-    },
-  };
-
-</script>
-<style lang="less" scoped>
-
-  .parentOption:not(:first-child) {
-    border-top: 1px solid rgba(0, 0, 0, 0.12);
-  }
-
-</style>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/DetailsTabView.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/DetailsTabView.vue
index 192faf6fc1..1dbd45bf0c 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/DetailsTabView.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/DetailsTabView.vue
@@ -65,6 +65,7 @@
                 ref="learning_activities"
                 v-model="contentLearningActivities"
                 :disabled="anyIsTopic"
+                :nodeIds="nodeIds"
                 @focus="trackClick('Learning activities')"
               />
               <!-- Level -->
@@ -72,6 +73,7 @@
                 v-if="oneSelected"
                 ref="contentLevel"
                 v-model="contentLevel"
+                :nodeIds="nodeIds"
                 @focus="trackClick('Levels dropdown')"
               />
               <!-- What you will need -->
@@ -79,6 +81,7 @@
                 v-if="oneSelected"
                 ref="resourcesNeeded"
                 v-model="resourcesNeeded"
+                :nodeIds="nodeIds"
                 @focus="trackClick('What you will need')"
               />
               <!-- Tags -->
@@ -111,7 +114,12 @@
             </VFlex>
           </VLayout>
           <!-- Category -->
-          <CategoryOptions v-if="oneSelected" ref="categories" v-model="categories" />
+          <CategoryOptions
+            v-if="oneSelected"
+            ref="categories"
+            v-model="categories"
+            :nodeIds="nodeIds"
+          />
         </VFlex>
       </VLayout>
 
@@ -142,7 +150,7 @@
             v-model="completionAndDuration"
             :kind="firstNode.kind"
             :fileDuration="fileDuration"
-            :required="!anyIsDocument || !allSameKind"
+            :required="!anyIsDocument"
           />
         </VFlex>
       </VLayout>
@@ -375,20 +383,19 @@
   import ContentNodeThumbnail from '../../views/files/thumbnails/ContentNodeThumbnail';
   import FileUpload from '../../views/files/FileUpload';
   import SubtitlesList from '../../views/files/supplementaryLists/SubtitlesList';
-  import { isImportedContent, importedChannelLink } from '../../utils';
+  import { isImportedContent, isDisableSourceEdits, importedChannelLink } from '../../utils';
   import AccessibilityOptions from './AccessibilityOptions.vue';
-  import LevelsOptions from './LevelsOptions.vue';
-  import ResourcesNeededOptions from './ResourcesNeededOptions.vue';
-  import LearningActivityOptions from './LearningActivityOptions.vue';
-  import CategoryOptions from './CategoryOptions.vue';
-  import CompletionOptions from './CompletionOptions.vue';
-  import FormatPresetsMap, { FormatPresetsNames } from 'shared/leUtils/FormatPresets';
+  import LevelsOptions from 'shared/views/contentNodeFields/LevelsOptions';
+  import CategoryOptions from 'shared/views/contentNodeFields/CategoryOptions';
+  import CompletionOptions from 'shared/views/contentNodeFields/CompletionOptions';
+  import LearningActivityOptions from 'shared/views/contentNodeFields/LearningActivityOptions';
+  import ResourcesNeededOptions from 'shared/views/contentNodeFields/ResourcesNeededOptions';
   import {
     getTitleValidators,
     getCopyrightHolderValidators,
     translateValidator,
   } from 'shared/utils/validation';
-  import { findLicense, memoizeDebounce } from 'shared/utils/helpers';
+  import { findLicense, memoizeDebounce, getFileDuration } from 'shared/utils/helpers';
   import LanguageDropdown from 'shared/views/LanguageDropdown';
   import HelpTooltip from 'shared/views/HelpTooltip';
   import LicenseDropdown from 'shared/views/LicenseDropdown';
@@ -436,14 +443,10 @@
   }
 
   /**
-   * This function is used to generate getter/setters for new metadata fields that are boolean maps:
-   * - `grade_levels` (sometimes referred to as `content_levels`)
-   * - `learner_needs` (resources needed)
+   * This function is used to generate getter/setters having its value as
+   * an array for metadata fields that are boolean maps:
    * - `accessibility_labels` (accessibility options)
-   * - `learning_activities` (learning activities)
-   * - `categories` (categories)
    */
-
   function generateNestedNodesGetterSetter(key) {
     return {
       get() {
@@ -477,6 +480,42 @@
     };
   }
 
+  /**
+   * This function is used to generate getter/setters having its value as
+   * an object for metadata fields that are boolean maps:
+   * - `grade_levels` (sometimes referred to as `content_levels`)
+   * - `learner_needs` (resources needed)
+   * - `learning_activities` (learning activities)
+   * - `categories` (categories)
+   */
+  function generateNestedNodesGetterSetterObject(key) {
+    return {
+      get() {
+        const value = {};
+        for (const node of this.nodes) {
+          const diffTrackerNode = this.diffTracker[node.id] || {};
+          const currentValue = diffTrackerNode[key] || node[key] || {};
+          Object.entries(currentValue).forEach(([option, optionValue]) => {
+            if (optionValue) {
+              value[option] = value[option] || [];
+              value[option].push(node.id);
+            }
+          });
+        }
+        return value;
+      },
+      set(value) {
+        const newMap = {};
+        for (const option in value) {
+          if (value[option].length === this.nodes.length) {
+            newMap[option] = true;
+          }
+        }
+        this.update({ [key]: newMap });
+      },
+    };
+  }
+
   export default {
     name: 'DetailsTabView',
     components: {
@@ -586,24 +625,28 @@
       role: generateGetterSetter('role_visibility'),
       language: generateGetterSetter('language'),
       accessibility: generateNestedNodesGetterSetter('accessibility_labels'),
-      contentLevel: generateNestedNodesGetterSetter('grade_levels'),
-      resourcesNeeded: generateNestedNodesGetterSetter('learner_needs'),
+      contentLevel: generateNestedNodesGetterSetterObject('grade_levels'),
+      resourcesNeeded: generateNestedNodesGetterSetterObject('learner_needs'),
       forBeginners: {
         get() {
-          return this.resourcesNeeded.includes(ResourcesNeededTypes.FOR_BEGINNERS);
+          const value = this.resourcesNeeded[ResourcesNeededTypes.FOR_BEGINNERS];
+          return value && value.length === this.nodes.length;
         },
         set(value) {
           if (value) {
-            this.resourcesNeeded = [...this.resourcesNeeded, ResourcesNeededTypes.FOR_BEGINNERS];
+            this.resourcesNeeded = {
+              ...this.resourcesNeeded,
+              [ResourcesNeededTypes.FOR_BEGINNERS]: this.nodeIds,
+            };
           } else {
-            this.resourcesNeeded = this.resourcesNeeded.filter(
-              r => r !== ResourcesNeededTypes.FOR_BEGINNERS
-            );
+            const newMap = { ...this.resourcesNeeded };
+            delete newMap[ResourcesNeededTypes.FOR_BEGINNERS];
+            this.resourcesNeeded = newMap;
           }
         },
       },
-      contentLearningActivities: generateNestedNodesGetterSetter('learning_activities'),
-      categories: generateNestedNodesGetterSetter('categories'),
+      contentLearningActivities: generateNestedNodesGetterSetterObject('learning_activities'),
+      categories: generateNestedNodesGetterSetterObject('categories'),
       license() {
         return this.getValueFromNodes('license');
       },
@@ -660,7 +703,7 @@
         return this.nodes.some(node => node.freeze_authoring_data);
       },
       disableSourceEdits() {
-        return this.disableAuthEdits || this.isImported;
+        return this.nodes.some(isDisableSourceEdits);
       },
       detectedImportText() {
         const count = this.nodes.filter(node => node.freeze_authoring_data).length;
@@ -694,20 +737,7 @@
         return (this.firstNode && this.getContentNodeFiles(this.firstNode.id)) || [];
       },
       fileDuration() {
-        if (
-          this.firstNode.kind === ContentKindsNames.AUDIO ||
-          this.firstNode.kind === ContentKindsNames.VIDEO
-        ) {
-          // filter for the correct file types,
-          // to exclude files such as subtitle or cc
-          const audioVideoFiles = this.nodeFiles.filter(file => this.allowedFileType(file));
-          // return the last item in the array
-          const file = audioVideoFiles[audioVideoFiles.length - 1];
-          if (file) {
-            return file.duration;
-          }
-        }
-        return null;
+        return getFileDuration(this.nodeFiles, this.firstNode.kind);
       },
       videoSelected() {
         return this.oneSelected && this.firstNode.kind === ContentKindsNames.VIDEO;
@@ -789,17 +819,6 @@
       isUnique(value) {
         return value !== nonUniqueValue;
       },
-      allowedFileType(file) {
-        let allowedFileTypes = [];
-        // add the relevant format presets for audio and video
-        // high res and low res are currently the same, so only one is included
-        allowedFileTypes.push(
-          FormatPresetsMap.get(FormatPresetsNames.HIGH_RES_VIDEO).allowed_formats
-        );
-        allowedFileTypes.push(FormatPresetsMap.get(FormatPresetsNames.AUDIO).allowed_formats);
-        allowedFileTypes = allowedFileTypes.flat();
-        return allowedFileTypes.includes(file.file_format);
-      },
       getValueFromNodes(key) {
         const results = uniq(
           this.nodes.map(node => {
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue
index 30947603d5..591afec53b 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue
@@ -121,6 +121,9 @@
           </VFlex>
         </VLayout>
       </BottomBar>
+      <AboutLicensesModal
+        v-if="isAboutLicensesModalOpen"
+      />
     </VDialog>
 
     <!-- Dialog for catching unsaved changes -->
@@ -186,6 +189,7 @@
   import { fileSizeMixin, routerMixin } from 'shared/mixins';
   import FileStorage from 'shared/views/files/FileStorage';
   import MessageDialog from 'shared/views/MessageDialog';
+  import AboutLicensesModal from 'shared/views/AboutLicensesModal';
   import ResizableNavigationDrawer from 'shared/views/ResizableNavigationDrawer';
   import Uploader from 'shared/views/files/Uploader';
   import LoadingText from 'shared/views/LoadingText';
@@ -215,6 +219,7 @@
       SavingIndicator,
       ToolBar,
       BottomBar,
+      AboutLicensesModal,
     },
     mixins: [fileSizeMixin, routerMixin],
     props: {
@@ -247,6 +252,7 @@
       };
     },
     computed: {
+      ...mapGetters(['isAboutLicensesModalOpen']),
       ...mapGetters('contentNode', ['getContentNode', 'getContentNodeIsValid']),
       ...mapGetters('assessmentItem', ['getAssessmentItems']),
       ...mapGetters('currentChannel', ['currentChannel', 'canEdit']),
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/ResourcesNeededOptions.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/ResourcesNeededOptions.vue
deleted file mode 100644
index f3262cebed..0000000000
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/ResourcesNeededOptions.vue
+++ /dev/null
@@ -1,81 +0,0 @@
-<template>
-
-  <DropdownWrapper>
-    <template #default="{ attach, menuProps }">
-      <VSelect
-        ref="need"
-        v-model="need"
-        :items="resources"
-        box
-        chips
-        :label="$tr('resourcesNeededLabel')"
-        multiple
-        deletableChips
-        clearable
-        :menu-props="menuProps"
-        :attach="attach"
-        :hint="hint"
-        persistent-hint
-      />
-    </template>
-  </DropdownWrapper>
-
-</template>
-
-<script>
-
-  import { ResourcesNeededTypes } from 'shared/constants';
-  import { constantsTranslationMixin, metadataTranslationMixin } from 'shared/mixins';
-  import DropdownWrapper from 'shared/views/form/DropdownWrapper';
-
-  const dropdownItems = [
-    'PEERS',
-    'TEACHER',
-    'INTERNET',
-    'SPECIAL_SOFTWARE',
-    'PAPER_PENCIL',
-    'OTHER_SUPPLIES',
-  ];
-
-  export default {
-    name: 'ResourcesNeededOptions',
-    components: { DropdownWrapper },
-    mixins: [constantsTranslationMixin, metadataTranslationMixin],
-    props: {
-      value: {
-        type: Array,
-        default: () => [],
-      },
-    },
-    computed: {
-      need: {
-        get() {
-          return this.value;
-        },
-        set(value) {
-          this.$emit('input', value);
-        },
-      },
-      resources() {
-        return dropdownItems.map(key => ({
-          text: this.translateMetadataString(key),
-          value: ResourcesNeededTypes[key],
-        }));
-      },
-      hint() {
-        return this.value && this.value.includes(ResourcesNeededTypes.OTHER_SUPPLIES)
-          ? this.$tr('furtherExplanation')
-          : '';
-      },
-    },
-    $trs: {
-      resourcesNeededLabel: 'Requirements',
-      furtherExplanation:
-        "Please add to the 'Description' field any additional supplies learners will need in order to use this resource",
-    },
-  };
-
-</script>
-<style lang="less">
-
-</style>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/categoryOptions.spec.js b/contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/categoryOptions.spec.js
deleted file mode 100644
index c8a82a30e8..0000000000
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/categoryOptions.spec.js
+++ /dev/null
@@ -1,331 +0,0 @@
-import Vue from 'vue';
-import Vuetify from 'vuetify';
-import { shallowMount } from '@vue/test-utils';
-import CategoryOptions from '../CategoryOptions.vue';
-
-Vue.use(Vuetify);
-
-const testDropdown = [
-  {
-    text: 'DAILY_LIFE',
-    value: 'PbGoe2MV',
-  },
-  {
-    text: 'CURRENT_EVENTS',
-    value: 'PbGoe2MV.J7CU1IxN',
-  },
-  {
-    text: 'DIVERSITY',
-    value: 'PbGoe2MV.EHcbjuKq',
-  },
-  {
-    text: 'ENTREPRENEURSHIP',
-    value: 'PbGoe2MV.kyxTNsRS',
-  },
-  {
-    text: 'ENVIRONMENT',
-    value: 'PbGoe2MV.tS7WKnZ7',
-  },
-  {
-    text: 'FINANCIAL_LITERACY',
-    value: 'PbGoe2MV.HGIc9sZq',
-  },
-  {
-    text: 'MEDIA_LITERACY',
-    value: 'PbGoe2MV.UOTL#KIV',
-  },
-  {
-    text: 'MENTAL_HEALTH',
-    value: 'PbGoe2MV.d8&gCo2N',
-  },
-  {
-    text: 'PUBLIC_HEALTH',
-    value: 'PbGoe2MV.kivAZaeX',
-  },
-  {
-    text: 'FOR_TEACHERS',
-    value: 'ziJ6PCuU',
-  },
-  {
-    text: 'GUIDES',
-    value: 'ziJ6PCuU.RLfhp37t',
-  },
-  {
-    text: 'LESSON_PLANS',
-    value: 'ziJ6PCuU.lOBPr5ix',
-  },
-  {
-    text: 'FOUNDATIONS',
-    value: 'BCG3&slG',
-  },
-  {
-    text: 'DIGITAL_LITERACY',
-    value: 'BCG3&slG.wZ3EAedB',
-  },
-  {
-    text: 'FOUNDATIONS_LOGIC_AND_CRITICAL_THINKING',
-    value: 'BCG3&slG.0&d0qTqS',
-  },
-  {
-    text: 'LEARNING_SKILLS',
-    value: 'BCG3&slG.fP2j70bj',
-  },
-  {
-    text: 'LITERACY',
-    value: 'BCG3&slG.HLo9TbNq',
-  },
-  {
-    text: 'NUMERACY',
-    value: 'BCG3&slG.Tsyej9ta',
-  },
-  {
-    text: 'SCHOOL',
-    value: 'd&WXdXWF',
-  },
-  {
-    text: 'ARTS',
-    value: 'd&WXdXWF.5QAjgfv7',
-  },
-  {
-    text: 'DANCE',
-    value: 'd&WXdXWF.5QAjgfv7.BUMJJBnS',
-  },
-  {
-    text: 'DRAMA',
-    value: 'd&WXdXWF.5QAjgfv7.XsWznP4o',
-  },
-  {
-    text: 'MUSIC',
-    value: 'd&WXdXWF.5QAjgfv7.u0aKjT4i',
-  },
-  {
-    text: 'VISUAL_ART',
-    value: 'd&WXdXWF.5QAjgfv7.4LskOFXj',
-  },
-  {
-    text: 'COMPUTER_SCIENCE',
-    value: 'd&WXdXWF.e#RTW9E#',
-  },
-  {
-    text: 'MECHANICAL_ENGINEERING',
-    value: 'd&WXdXWF.e#RTW9E#.8ZoaPsVW',
-  },
-  {
-    text: 'PROGRAMMING',
-    value: 'd&WXdXWF.e#RTW9E#.CfnlTDZ#',
-  },
-  {
-    text: 'WEB_DESIGN',
-    value: 'd&WXdXWF.e#RTW9E#.P7s8FxQ8',
-  },
-  {
-    text: 'HISTORY',
-    value: 'd&WXdXWF.zWtcJ&F2',
-  },
-  {
-    text: 'LANGUAGE_LEARNING',
-    value: 'd&WXdXWF.JDUfJNXc',
-  },
-  {
-    text: 'MATHEMATICS',
-    value: 'd&WXdXWF.qs0Xlaxq',
-  },
-  {
-    text: 'ALGEBRA',
-    value: 'd&WXdXWF.qs0Xlaxq.0t5msbL5',
-  },
-  {
-    text: 'ARITHMETIC',
-    value: 'd&WXdXWF.qs0Xlaxq.nG96nHDc',
-  },
-  {
-    text: 'CALCULUS',
-    value: 'd&WXdXWF.qs0Xlaxq.8rJ57ht6',
-  },
-  {
-    text: 'GEOMETRY',
-    value: 'd&WXdXWF.qs0Xlaxq.lb7ELcK5',
-  },
-  {
-    text: 'STATISTICS',
-    value: 'd&WXdXWF.qs0Xlaxq.jNm15RLB',
-  },
-  {
-    text: 'READING_AND_WRITING',
-    value: 'd&WXdXWF.kHKJ&PbV',
-  },
-  {
-    text: 'LITERATURE',
-    value: 'd&WXdXWF.kHKJ&PbV.DJLBbaEk',
-  },
-  {
-    text: 'LOGIC_AND_CRITICAL_THINKING',
-    value: 'd&WXdXWF.kHKJ&PbV.YMBXStib',
-  },
-  {
-    text: 'READING_COMPREHENSION',
-    value: 'd&WXdXWF.kHKJ&PbV.r7RxB#9t',
-  },
-  {
-    text: 'WRITING',
-    value: 'd&WXdXWF.kHKJ&PbV.KFJOCr&6',
-  },
-  {
-    text: 'SCIENCES',
-    value: 'd&WXdXWF.i1IdaNwr',
-  },
-  {
-    text: 'ASTRONOMY',
-    value: 'd&WXdXWF.i1IdaNwr.mjSF4QlF',
-  },
-  {
-    text: 'BIOLOGY',
-    value: 'd&WXdXWF.i1IdaNwr.uErN4PdS',
-  },
-  {
-    text: 'CHEMISTRY',
-    value: 'd&WXdXWF.i1IdaNwr.#r5ocgid',
-  },
-  {
-    text: 'EARTH_SCIENCE',
-    value: 'd&WXdXWF.i1IdaNwr.zbDzxDE7',
-  },
-  {
-    text: 'PHYSICS',
-    value: 'd&WXdXWF.i1IdaNwr.r#wbt#jF',
-  },
-  {
-    text: 'SOCIAL_SCIENCES',
-    value: 'd&WXdXWF.K80UMYnW',
-  },
-  {
-    text: 'ANTHROPOLOGY',
-    value: 'd&WXdXWF.K80UMYnW.ViBlbQR&',
-  },
-  {
-    text: 'CIVIC_EDUCATION',
-    value: 'd&WXdXWF.K80UMYnW.F863vKiF',
-  },
-  {
-    text: 'POLITICAL_SCIENCE',
-    value: 'd&WXdXWF.K80UMYnW.K72&pITr',
-  },
-  {
-    text: 'SOCIOLOGY',
-    value: 'd&WXdXWF.K80UMYnW.75WBu1ZS',
-  },
-  {
-    text: 'WORK',
-    value: 'l7DsPDlm',
-  },
-  {
-    text: 'PROFESSIONAL_SKILLS',
-    value: 'l7DsPDlm.#N2VymZo',
-  },
-  {
-    text: 'TECHNICAL_AND_VOCATIONAL_TRAINING',
-    value: 'l7DsPDlm.ISEXeZt&',
-  },
-  {
-    text: 'INDUSTRY_AND_SECTOR_SPECIFIC',
-    value: 'l7DsPDlm.ISEXeZt&.pRvOzJTE',
-  },
-  {
-    text: 'SKILLS_TRAINING',
-    value: 'l7DsPDlm.ISEXeZt&.&1WpYE&n',
-  },
-  {
-    text: 'TOOLS_AND_SOFTWARE_TRAINING',
-    value: 'l7DsPDlm.ISEXeZt&.1JfIbP&N',
-  },
-];
-
-describe('CategoryOptions', () => {
-  it('smoke test', () => {
-    const wrapper = shallowMount(CategoryOptions);
-    expect(wrapper.isVueInstance()).toBe(true);
-  });
-  it('emits expected data', () => {
-    const wrapper = shallowMount(CategoryOptions);
-    const value = 'string';
-    wrapper.vm.$emit('input', value);
-
-    expect(wrapper.emitted().input).toBeTruthy();
-    expect(wrapper.emitted().input.length).toBe(1);
-    expect(wrapper.emitted().input[0]).toEqual([value]);
-  });
-  const expectedFamilyTree = [
-    { text: 'SCHOOL', value: 'd&WXdXWF' },
-    { text: 'ARTS', value: 'd&WXdXWF.5QAjgfv7' },
-    { text: 'DANCE', value: 'd&WXdXWF.5QAjgfv7.BUMJJBnS' },
-  ];
-
-  describe('display', () => {
-    it('has a tooltip that displays the tree for value of an item', () => {
-      const wrapper = shallowMount(CategoryOptions);
-      const item = 'd&WXdXWF.5QAjgfv7.BUMJJBnS'; // 'Dance'
-      const expectedToolTip = 'School - Arts - Dance';
-
-      expect(wrapper.vm.tooltipHelper(item)).toEqual(expectedToolTip);
-    });
-    it(`dropdown has 'levels' key necessary to display the nested structure of categories`, () => {
-      const wrapper = shallowMount(CategoryOptions);
-      const dropdown = wrapper.vm.categoriesList;
-      const everyCategoryHasLevelsKey = dropdown.every(item => 'level' in item);
-
-      expect(everyCategoryHasLevelsKey).toBeTruthy();
-    });
-  });
-
-  describe('nested family structure', () => {
-    it('can display all the ids of family tree of an item', () => {
-      const wrapper = shallowMount(CategoryOptions);
-      const item = 'd&WXdXWF.5QAjgfv7.BUMJJBnS'; //'Dance'
-      const expectedFamilyTreeIds = expectedFamilyTree.map(item => item.value);
-
-      expect(wrapper.vm.findFamilyTreeIds(item).sort()).toEqual(expectedFamilyTreeIds.sort());
-    });
-    it('can display array of objects of family tree of an item', () => {
-      const wrapper = shallowMount(CategoryOptions);
-      const item = 'd&WXdXWF.5QAjgfv7.BUMJJBnS'; //'Dance'
-
-      expect(wrapper.vm.displayFamilyTree(testDropdown, item)).toEqual(expectedFamilyTree);
-    });
-  });
-
-  describe('interactions', () => {
-    it('when user checks an item, that is emitted to the parent component', () => {
-      const wrapper = shallowMount(CategoryOptions);
-      const item = 'abcd';
-      wrapper.vm.$emit = jest.fn();
-      wrapper.vm.add(item);
-
-      expect(wrapper.vm.$emit.mock.calls[0][0]).toBe('input');
-      expect(wrapper.vm.$emit.mock.calls[0][1]).toEqual([item]);
-    });
-    it('when user unchecks an item, that is emitted to the parent component', () => {
-      const wrapper = shallowMount(CategoryOptions);
-      const item = 'defj';
-      wrapper.vm.$emit = jest.fn();
-      wrapper.vm.remove(item);
-
-      expect(wrapper.vm.$emit.mock.calls[0][0]).toBe('input');
-      expect(wrapper.vm.$emit.mock.calls[0][1]).toEqual([]);
-    });
-  });
-
-  describe('close button on chip interactions', () => {
-    it('in the autocomplete bar, the chip is removed when user clicks on its close button', () => {
-      const wrapper = shallowMount(CategoryOptions, {
-        data() {
-          return { selected: ['remove me', 'abc', 'def', 'abc.'] };
-        },
-      });
-      const originalChipsLength = wrapper.vm.selected.length;
-      wrapper.vm.remove('remove me');
-      const chips = wrapper.vm.selected;
-
-      expect(chips.length).toEqual(originalChipsLength - 1);
-    });
-  });
-});
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/resourcesNeededOptions.spec.js b/contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/resourcesNeededOptions.spec.js
deleted file mode 100644
index 0fc09b1598..0000000000
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/resourcesNeededOptions.spec.js
+++ /dev/null
@@ -1,49 +0,0 @@
-import Vue from 'vue';
-import Vuetify from 'vuetify';
-import { shallowMount, mount } from '@vue/test-utils';
-import ResourcesNeededOptions from '../ResourcesNeededOptions.vue';
-
-Vue.use(Vuetify);
-
-function makeWrapper(value) {
-  return mount(ResourcesNeededOptions, {
-    propsData: {
-      value,
-    },
-  });
-}
-
-describe('ResourcesNeededOptions', () => {
-  it('smoke test', () => {
-    const wrapper = shallowMount(ResourcesNeededOptions);
-
-    expect(wrapper.isVueInstance()).toBe(true);
-  });
-
-  describe('updating state', () => {
-    it('should update resources field with new values received from a parent', () => {
-      const resourcesNeeded = ['person', 'book'];
-      const wrapper = makeWrapper(resourcesNeeded);
-      const dropdown = wrapper.find({ name: 'v-select' });
-
-      expect(dropdown.props('value')).toEqual(resourcesNeeded);
-
-      wrapper.setProps({
-        value: ['cat'],
-      });
-      expect(dropdown.props('value')).toEqual(['cat']);
-    });
-
-    it('should emit new input values', () => {
-      const resourcesNeeded = ['person', 'book', 'train'];
-      const wrapper = makeWrapper([]);
-      const dropdown = wrapper.find({ name: 'v-select' });
-      dropdown.vm.$emit('input', resourcesNeeded);
-
-      return Vue.nextTick().then(() => {
-        const emittedLevels = wrapper.emitted('input').pop()[0];
-        expect(emittedLevels).toEqual(resourcesNeeded);
-      });
-    });
-  });
-});
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/move/MoveModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/move/MoveModal.vue
index c4da1b55a4..2ccf76569e 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/move/MoveModal.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/move/MoveModal.vue
@@ -173,6 +173,10 @@
         type: Boolean,
         default: false,
       },
+      clipboardTopicResourceCount: {
+        type: Object,
+        default: () => ({}),
+      },
     },
     data() {
       return {
@@ -200,7 +204,10 @@
         },
       },
       moveHeader() {
-        return this.$tr('moveItems', this.getTopicAndResourceCounts(this.moveNodeIds));
+        const resourceCounts = Object.keys(this.clipboardTopicResourceCount).length
+          ? this.clipboardTopicResourceCount
+          : this.getTopicAndResourceCounts(this.moveNodeIds);
+        return this.$tr('moveItems', resourceCounts);
       },
       moveHereButtonDisabled() {
         if (this.moveNodesInProgress) {
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/publish/PublishModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/publish/PublishModal.vue
index cdd2faccbc..670398ad47 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/publish/PublishModal.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/publish/PublishModal.vue
@@ -49,7 +49,7 @@
             :label="$tr('versionDescriptionLabel')"
             :invalid="!isDescriptionValid"
             :invalidText="$tr('descriptionRequiredMessage')"
-            :showInvalidText="showInvalidText"
+            :showInvalidText="showDescriptionInvalidText"
             autofocus
             textArea
           />
@@ -57,6 +57,20 @@
         <KGridItem :layout="{ span: 1 }">
           <HelpTooltip :text="$tr('descriptionDescriptionTooltip')" bottom />
         </KGridItem>
+
+        <KGridItem v-show="showLanguageDropdown" :layout="{ span: 11 }">
+          <KSelect
+            v-model="language"
+            :label="$tr('languageLabel')"
+            :invalid="showLanguageInvalidText"
+            :invalidText="$tr('languageRequiredMessage')"
+            :options="languages"
+            @change="showLanguageInvalidText = !isLanguageValid"
+          />
+        </KGridItem>
+        <KGridItem v-show="showLanguageDropdown" :layout="{ span: 1 }">
+          <HelpTooltip :text="$tr('languageDescriptionTooltip')" bottom />
+        </KGridItem>
       </KFixedGrid>
     </KModal>
 
@@ -71,6 +85,7 @@
   import { mapActions, mapGetters } from 'vuex';
   import HelpTooltip from 'shared/views/HelpTooltip';
   import { forceServerSync } from 'shared/data/serverSync';
+  import { LanguagesList } from 'shared/leUtils/Languages';
 
   export default {
     name: 'PublishModal',
@@ -88,9 +103,13 @@
         step: 0,
         publishDescription: '',
         size: 0,
-        showInvalidText: false, // lazy validation
+        showDescriptionInvalidText: false, // lazy validation
+        showLanguageInvalidText: false,
         loading: false,
         loadingTaskId: null,
+        language: {},
+        channelLanguages: [],
+        channelLanguageExists: true,
       };
     },
     computed: {
@@ -112,9 +131,34 @@
       isDescriptionValid() {
         return this.publishDescription && this.publishDescription.trim();
       },
+      isLanguageValid() {
+        return Object.keys(this.language).length > 0;
+      },
       sizeCalculationTask() {
         return this.loadingTaskId ? this.getAsyncTask(this.loadingTaskId) : null;
       },
+      isCheffedChannel() {
+        return Boolean(this.currentChannel.ricecooker_version);
+      },
+      isPrivateChannel() {
+        return this.currentChannel.public;
+      },
+      isFirstPublish() {
+        return this.currentChannel.version === 0;
+      },
+      defaultLanguage() {
+        const channelLang = this.filterLanguages(l => l.id === this.currentChannel.language)[0];
+        return this.languages.some(lang => lang.value === channelLang.value) ? channelLang : {};
+      },
+      showLanguageDropdown() {
+        return (
+          ((this.isCheffedChannel || this.isPrivateChannel) && this.isFirstPublish) ||
+          !this.channelLanguageExists
+        );
+      },
+      languages() {
+        return this.filterLanguages(l => this.channelLanguages.includes(l.id));
+      },
     },
     watch: {
       sizeCalculationTask(task) {
@@ -139,16 +183,35 @@
       //   this.loading = response.stale;
       //   this.loadingTaskId = response.changes.length ? response.changes[0].key : null;
       // });
+      this.channelLanguageExistsInResources().then(exists => {
+        this.channelLanguageExists = exists;
+        if (!exists) {
+          this.getLanguagesInChannelResources().then(languages => {
+            this.channelLanguages = languages.length ? languages : [this.currentChannel.language];
+            this.language = this.defaultLanguage;
+          });
+        } else {
+          this.channelLanguages = [this.currentChannel.language];
+          this.language = this.defaultLanguage;
+        }
+      });
     },
     methods: {
-      ...mapActions('currentChannel', ['publishChannel']),
+      ...mapActions('channel', ['updateChannel']),
+      ...mapActions('currentChannel', [
+        'publishChannel',
+        'channelLanguageExistsInResources',
+        'getLanguagesInChannelResources',
+      ]),
       close() {
         this.publishDescription = '';
+        this.language = this.defaultLanguage;
         this.dialog = false;
       },
       validate() {
-        this.showInvalidText = true;
-        return this.isDescriptionValid;
+        this.showDescriptionInvalidText = !this.isDescriptionValid;
+        this.showLanguageInvalidText = !this.isLanguageValid;
+        return !this.showDescriptionInvalidText && !this.showLanguageInvalidText;
       },
       async handlePublish() {
         if (this.validate()) {
@@ -156,9 +219,20 @@
             await forceServerSync();
           }
 
-          this.publishChannel(this.publishDescription).then(this.close);
+          this.updateChannel({
+            id: this.currentChannel.id,
+            language: this.language.value,
+          }).then(() => {
+            this.publishChannel(this.publishDescription).then(this.close);
+          });
         }
       },
+      filterLanguages(filterFn) {
+        return LanguagesList.filter(filterFn).map(l => ({
+          value: l.id,
+          label: l.native_name,
+        }));
+      },
     },
     $trs: {
       // Incomplete channel window
@@ -174,8 +248,11 @@
       descriptionRequiredMessage: "Please describe what's new in this version before publishing",
       descriptionDescriptionTooltip:
         'This description will be shown to Kolibri admins before they update channel versions',
+      languageDescriptionTooltip: 'The default language for a channel and its resources',
       cancelButton: 'Cancel',
       publishButton: 'Publish',
+      languageLabel: 'Language',
+      languageRequiredMessage: 'Please select a language for this channel',
     },
   };
 
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/publish/__tests__/publishModal.spec.js b/contentcuration/contentcuration/frontend/channelEdit/components/publish/__tests__/publishModal.spec.js
index 3027fae7a3..1de950ceec 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/publish/__tests__/publishModal.spec.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/publish/__tests__/publishModal.spec.js
@@ -85,17 +85,21 @@ describe('publishModal', () => {
     });
   });
   describe('on publish step', () => {
+    const updateChannel = jest.fn();
     const publishChannel = jest.fn();
+
     beforeEach(() => {
       wrapper.setData({ step: steps.PUBLISH });
       wrapper.setMethods({
-        publishChannel: () => {
+        updateChannel: () => {
           return new Promise(resolve => {
+            updateChannel();
             publishChannel();
             resolve();
           });
         },
       });
+      updateChannel.mockReset();
       publishChannel.mockReset();
     });
     it('publish button should trigger form validation', () => {
@@ -110,20 +114,26 @@ describe('publishModal', () => {
         "Please describe what's new in this version before publishing"
       );
     });
-    it('publishing should be blocked if no description is given', () => {
+    it('publishing should be blocked if no description & language are given', () => {
       wrapper
         .find('[data-test="confirm-publish-modal"]')
         .find('form')
         .trigger('submit');
+      expect(updateChannel).not.toHaveBeenCalled();
       expect(publishChannel).not.toHaveBeenCalled();
     });
-    it('publish button should call publishChannel if description is given', () => {
+    it('publish button should call updateChannel if description and language are given', () => {
       const description = 'Version notes';
-      wrapper.setData({ publishDescription: description });
+      const language = {
+        value: 'en',
+        label: 'English',
+      };
+      wrapper.setData({ publishDescription: description, language });
       wrapper
         .find('[data-test="confirm-publish-modal"]')
         .find('form')
         .trigger('submit');
+      expect(updateChannel).toHaveBeenCalled();
       expect(publishChannel).toHaveBeenCalled();
     });
     it('cancel button on publish step should also close modal', () => {
diff --git a/contentcuration/contentcuration/frontend/channelEdit/constants.js b/contentcuration/contentcuration/frontend/channelEdit/constants.js
index 6512e9e9b4..36f29a78fd 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/constants.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/constants.js
@@ -80,3 +80,16 @@ export const DraggableRegions = {
  * @type {number}
  */
 export const ImportSearchPageSize = 10;
+
+export const QuickEditModals = {
+  TITLE_DESCRIPTION: 'TITLE_DESCRIPTION',
+  TAGS: 'TAGS',
+  LANGUAGE: 'LANGUAGE',
+  CATEGORIES: 'CATEGORIES',
+  LEVELS: 'LEVELS',
+  LEARNING_ACTIVITIES: 'LEARNING_ACTIVITIES',
+  SOURCE: 'SOURCE',
+  AUDIENCE: 'AUDIENCE',
+  COMPLETION: 'COMPLETION',
+  WHAT_IS_NEEDED: 'WHAT_IS_NEEDED',
+};
diff --git a/contentcuration/contentcuration/frontend/channelEdit/getters.js b/contentcuration/contentcuration/frontend/channelEdit/getters.js
index d914622d62..455af2aece 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/getters.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/getters.js
@@ -10,6 +10,10 @@ export function isComfortableViewMode(state) {
   return viewMode === viewModes.COMFORTABLE;
 }
 
+export function isAboutLicensesModalOpen(state) {
+  return state.aboutLicensesModalOpen;
+}
+
 // Convenience function to format strings like "Page Name - Channel Name"
 // for tab titles
 export function appendChannelName(state, getters) {
diff --git a/contentcuration/contentcuration/frontend/channelEdit/mutations.js b/contentcuration/contentcuration/frontend/channelEdit/mutations.js
index 2e67ded644..2bd2a99369 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/mutations.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/mutations.js
@@ -5,3 +5,7 @@ export function SET_VIEW_MODE(state, viewMode) {
 export function SET_VIEW_MODE_OVERRIDES(state, overrides) {
   state.viewModeOverrides = overrides;
 }
+
+export function SET_SHOW_ABOUT_LICENSES(state, isOpen) {
+  state.aboutLicensesModalOpen = isOpen;
+}
diff --git a/contentcuration/contentcuration/frontend/channelEdit/store.js b/contentcuration/contentcuration/frontend/channelEdit/store.js
index 068563d111..39a01b26c8 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/store.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/store.js
@@ -31,6 +31,8 @@ export const STORE_CONFIG = {
        * to override the current `viewMode`.
        */
       viewModeOverrides: [],
+
+      aboutLicensesModalOpen: false,
     };
   },
   actions,
diff --git a/contentcuration/contentcuration/frontend/channelEdit/translator.js b/contentcuration/contentcuration/frontend/channelEdit/translator.js
index d58efa3f33..9479fbbcec 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/translator.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/translator.js
@@ -14,6 +14,8 @@ const MESSAGES = {
   errorMissingAnswer: 'Choose a correct answer',
   errorChooseAtLeastOneCorrectAnswer: 'Choose at least one correct answer',
   errorProvideAtLeastOneCorrectAnswer: 'Provide at least one correct answer',
+  selectionCount:
+    '{topicCount, plural, =0 {} one {# folder, } other {# folders, }}{resourceCount, plural, one {# resource} other {# resources}}',
 };
 
 export default createTranslator(NAMESPACE, MESSAGES);
diff --git a/contentcuration/contentcuration/frontend/channelEdit/utils.js b/contentcuration/contentcuration/frontend/channelEdit/utils.js
index 5e7b868ca9..0e28ea4075 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/utils.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/utils.js
@@ -4,77 +4,14 @@ import { ContentKindsNames } from 'shared/leUtils/ContentKinds';
 import { MasteryModelsNames } from 'shared/leUtils/MasteryModels';
 import { metadataStrings, constantStrings } from 'shared/mixins';
 import {
+  ContentModalities,
   AssessmentItemTypes,
   CompletionCriteriaModels,
-  ContentModalities,
   SHORT_LONG_ACTIVITY_MIDPOINT,
-  CompletionDropdownMap,
+  defaultCompletionCriteriaModels,
+  defaultCompletionCriteriaThresholds,
 } from 'shared/constants';
 
-// The constant mapping below is used to set
-// default completion criteria and durations
-// both as initial values in the edit modal, and
-// to ensure backwards compatibility for contentnodes
-// that were added before this was in place
-export const defaultCompletionCriteriaModels = {
-  [ContentKindsNames.VIDEO]: CompletionCriteriaModels.TIME,
-  [ContentKindsNames.AUDIO]: CompletionCriteriaModels.TIME,
-  [ContentKindsNames.DOCUMENT]: CompletionCriteriaModels.PAGES,
-  [ContentKindsNames.H5P]: CompletionCriteriaModels.DETERMINED_BY_RESOURCE,
-  [ContentKindsNames.HTML5]: CompletionCriteriaModels.APPROX_TIME,
-  [ContentKindsNames.ZIM]: CompletionCriteriaModels.APPROX_TIME,
-  [ContentKindsNames.EXERCISE]: CompletionCriteriaModels.MASTERY,
-};
-
-export const defaultCompletionCriteriaThresholds = {
-  // Audio and Video threshold defaults are dynamic based
-  // on the duration of the file itself.
-  [ContentKindsNames.DOCUMENT]: '100%',
-  [ContentKindsNames.HTML5]: 300,
-  // We cannot set an automatic default threshold for exercises.
-};
-
-export const completionCriteriaToDropdownMap = {
-  [CompletionCriteriaModels.TIME]: CompletionDropdownMap.completeDuration,
-  [CompletionCriteriaModels.APPROX_TIME]: CompletionDropdownMap.completeDuration,
-  [CompletionCriteriaModels.PAGES]: CompletionDropdownMap.allContent,
-  [CompletionCriteriaModels.DETERMINED_BY_RESOURCE]: CompletionDropdownMap.determinedByResource,
-  [CompletionCriteriaModels.MASTERY]: CompletionDropdownMap.goal,
-  [CompletionCriteriaModels.REFERENCE]: CompletionDropdownMap.reference,
-};
-
-export const CompletionOptionsDropdownMap = {
-  [ContentKindsNames.DOCUMENT]: [
-    CompletionDropdownMap.allContent,
-    CompletionDropdownMap.completeDuration,
-    CompletionDropdownMap.reference,
-  ],
-  [ContentKindsNames.EXERCISE]: [CompletionDropdownMap.goal, CompletionDropdownMap.practiceQuiz],
-  [ContentKindsNames.HTML5]: [
-    CompletionDropdownMap.completeDuration,
-    CompletionDropdownMap.determinedByResource,
-    CompletionDropdownMap.reference,
-  ],
-  [ContentKindsNames.ZIM]: [
-    CompletionDropdownMap.completeDuration,
-    CompletionDropdownMap.determinedByResource,
-    CompletionDropdownMap.reference,
-  ],
-  [ContentKindsNames.H5P]: [
-    CompletionDropdownMap.determinedByResource,
-    CompletionDropdownMap.completeDuration,
-    CompletionDropdownMap.reference,
-  ],
-  [ContentKindsNames.VIDEO]: [
-    CompletionDropdownMap.completeDuration,
-    CompletionDropdownMap.reference,
-  ],
-  [ContentKindsNames.AUDIO]: [
-    CompletionDropdownMap.completeDuration,
-    CompletionDropdownMap.reference,
-  ],
-};
-
 /**
  * Get correct answer index/indices out of an array of answer objects.
  * @param {String} questionType single/multiple selection, true/false, input question
@@ -203,6 +140,10 @@ export function isImportedContent(node) {
   );
 }
 
+export function isDisableSourceEdits(node) {
+  return node.freeze_authoring_data || isImportedContent(node);
+}
+
 export function importedChannelLink(node, router) {
   if (node && isImportedContent(node)) {
     const channelURI = window.Urls.channel(node.original_channel_id);
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/CurrentTopicView.vue b/contentcuration/contentcuration/frontend/channelEdit/views/CurrentTopicView.vue
index b684e67682..d7d842ac9a 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/CurrentTopicView.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/CurrentTopicView.vue
@@ -11,7 +11,7 @@
             <VFlex class="font-weight-bold text-truncate" shrink :class="getTitleClass(item)">
               {{ getTitle(item) }}
             </VFlex>
-            <Menu v-if="item.displayNodeOptions">
+            <Menu v-if="item.displayNodeOptions" v-model="breadcrumbsMenu">
               <template #activator="{ on }">
                 <KIconButton
                   icon="dropdown"
@@ -20,7 +20,7 @@
                   v-on="on"
                 />
               </template>
-              <ContentNodeOptions v-if="node" :nodeId="topicId" />
+              <ContentNodeOptions v-if="node && breadcrumbsMenu" :nodeId="topicId" />
             </Menu>
           </VLayout>
           <span v-else class="grey--text" :class="getTitleClass(item)">
@@ -28,6 +28,31 @@
           </span>
         </template>
       </Breadcrumbs>
+      <Menu
+        v-if="!loadingAncestors"
+        class="pa-1"
+      >
+        <template #activator="{ on }">
+          <KIconButton
+            icon="list"
+            :tooltip="$tr('viewModeTooltip')"
+            :ariaLabel="$tr('viewModeTooltip')"
+            v-on="on"
+          />
+        </template>
+        <VList>
+          <VListTile
+            v-for="mode in viewModes"
+            :key="mode"
+            @click="setViewMode(mode), trackViewMode(mode)"
+          >
+            <VListTileAction style="min-width: 32px;">
+              <KIcon v-if="mode === viewMode" icon="check" />
+            </VListTileAction>
+            <VListTileTitle>{{ $tr(mode) }}</VListTileTitle>
+          </VListTile>
+        </VList>
+      </Menu>
     </VToolbar>
 
     <!-- Topic actions -->
@@ -37,54 +62,46 @@
           v-if="node && node.total_count"
           v-model="selectAll"
           :indeterminate="selected.length > 0 && !selectAll"
-          :label="selected.length ? '' : $tr('selectAllLabel')"
+          :label="selected.length ? selectionText : $tr('selectAllLabel')"
           style="font-size: 16px;"
         />
       </div>
-      <VSlideXTransition>
-        <div v-if="selected.length">
-          <KIconButton
-            v-if="canEdit"
-            icon="edit"
-            :text="$tr('editSelectedButton')"
-            data-test="edit-selected-btn"
-            @click="editNodes(selected)"
-          />
-          <KIconButton
-            icon="clipboard"
-            :text="$tr('copySelectedButton')"
-            data-test="copy-selected-to-clipboard-btn"
-            @click="copyToClipboard(selected)"
-          />
-          <KIconButton
-            v-if="canEdit"
-            icon="move"
-            :text="$tr('moveSelectedButton')"
-            data-test="move-selected-btn"
-            @click="openMoveModal"
-          />
-          <KIconButton
-            v-if="canEdit"
-            icon="copy"
-            :text="$tr('duplicateSelectedButton')"
-            data-test="duplicate-selected-btn"
-            @click="duplicateNodes(selected)"
-          />
-          <KIconButton
-            v-if="canEdit"
-            icon="sort"
-            :text="$tr('SortAlphabetically')"
-            @click="sortNodes(selected)"
-          />
-          <KIconButton
-            v-if="canEdit"
-            icon="remove"
-            :text="$tr('deleteSelectedButton')"
-            data-test="delete-selected-btn"
-            @click="removeNodes(selected)"
-          />
-        </div>
-      </VSlideXTransition>
+      <div v-if="selected.length" class="command-palette-wrapper">
+        <KListWithOverflow
+          :items="commandPaletteOptions"
+          :appearanceOverrides="{ justifyContent: 'flex-end' }"
+        >
+          <template #item="{ item }">
+            <KIconButton
+              :icon="item.icon"
+              :tooltip="item.label"
+              :disabled="item.disabled"
+              :data-test="item.dataTest"
+              @click="item.onClick()"
+            />
+          </template>
+          <template #more="{ overflowItems }">
+            <KIconButton
+              tooltip="More"
+              icon="optionsVertical"
+              appearance="flat-button"
+              :primary="false"
+            >
+              <template #menu>
+                <KDropdownMenu
+                  :options="overflowItems"
+                  @select="(option) => option.onClick()"
+                />
+              </template>
+            </KIconButton>
+          </template>
+          <template #divider>
+            <div class="divider-wrapper">
+              <div :style="dividerStyle"></div>
+            </div>
+          </template>
+        </KListWithOverflow>
+      </div>
 
       <MoveModal
         ref="moveModal"
@@ -92,46 +109,18 @@
         :moveNodeIds="selected"
         @target="moveNodes"
       />
-
-      <VSpacer />
-
-      <VFadeTransition>
-        <div v-show="selected.length" v-if="$vuetify.breakpoint.mdAndUp" class="px-1">
-          {{ selectionText }}
-        </div>
-      </VFadeTransition>
-
+      <VSpacer v-if="!selected.length" />
       <VToolbarItems v-if="!loadingAncestors">
-        <Menu class="pa-1">
+        <Menu v-if="canEdit">
           <template #activator="{ on }">
             <KIconButton
-              icon="list"
-              :tooltip="$tr('viewModeTooltip')"
-              :ariaLabel="$tr('viewModeTooltip')"
+              icon="dropdown"
+              :tooltip="$tr('addButton')"
+              :ariaLabel="$tr('addButton')"
+              :color="$themeTokens.textInverted"
               v-on="on"
             />
           </template>
-          <VList>
-            <VListTile
-              v-for="mode in viewModes"
-              :key="mode"
-              @click="setViewMode(mode), trackViewMode(mode)"
-            >
-              <VListTileAction style="min-width: 32px;">
-                <KIcon v-if="mode === viewMode" icon="check" />
-              </VListTileAction>
-              <VListTileTitle>{{ $tr(mode) }}</VListTileTitle>
-            </VListTile>
-          </VList>
-        </Menu>
-
-        <Menu v-if="canEdit">
-          <template #activator="{ on }">
-            <VBtn color="primary" class="ml-2" style="height: 32px;" v-on="on">
-              {{ $tr('addButton') }}
-              <KIcon icon="dropdown" :color="$themeTokens.textInverted" />
-            </VBtn>
-          </template>
           <VList>
             <VListTile @click="newTopicNode">
               <VListTileTitle>{{ $tr('addTopic') }}</VListTileTitle>
@@ -180,7 +169,12 @@
             @select="selected = [...selected, $event]"
             @deselect="selected = selected.filter(id => id !== $event)"
             @scroll="scroll"
-          />
+            @editTitleDescription="showTitleDescriptionModal"
+          >
+            <template #pagination>
+              <slot name="pagination"></slot>
+            </template>
+          </NodePanel>
         </DraggableRegion>
       </VFadeTransition>
       <ResourceDrawer
@@ -201,7 +195,7 @@
             :ariaLabel="$tr('editButton')"
             @click="editNodes([detailNodeId])"
           />
-          <Menu>
+          <Menu v-model="resourceDrawerMenu">
             <template #activator="{ on }">
               <KIconButton
                 size="small"
@@ -212,6 +206,7 @@
               />
             </template>
             <ContentNodeOptions
+              v-if="resourceDrawerMenu"
               :nodeId="detailNodeId"
               hideDetailsLink
               hideEditLink
@@ -230,7 +225,6 @@
         </template>
       </ResourceDrawer>
     </VLayout>
-
   </VContainer>
 
 </template>
@@ -242,7 +236,13 @@
   import MoveModal from '../components/move/MoveModal';
   import ContentNodeOptions from '../components/ContentNodeOptions';
   import ResourceDrawer from '../components/ResourceDrawer';
-  import { RouteNames, viewModes, DraggableRegions, DraggableUniverses } from '../constants';
+  import {
+    RouteNames,
+    viewModes,
+    DraggableRegions,
+    DraggableUniverses,
+    QuickEditModals,
+  } from '../constants';
   import NodePanel from './NodePanel';
   import ToolBar from 'shared/views/ToolBar';
   import Breadcrumbs from 'shared/views/Breadcrumbs';
@@ -287,6 +287,8 @@
         loadingAncestors: false,
         elevated: false,
         moveModalOpen: false,
+        breadcrumbsMenu: false,
+        resourceDrawerMenu: false,
       };
     },
     computed: {
@@ -305,7 +307,7 @@
         'getContentNode',
         'getContentNodes',
         'getContentNodeAncestors',
-        'getTopicAndResourceCounts',
+        'getSelectedTopicAndResourceCountText',
         'getContentNodeChildren',
         'isNodeInCopyingState',
       ]),
@@ -338,12 +340,139 @@
           }
         },
       },
+      commandPaletteOptions() {
+        const groupedOptions = [
+          [
+            {
+              label: this.$tr('editSelectedButton'),
+              icon: 'edit',
+              onClick: () => this.editNodes(this.selected),
+              condition: this.canEdit,
+              dataTest: 'edit-selected-btn',
+            },
+            {
+              label: this.$tr('moveSelectedButton'),
+              icon: 'move',
+              onClick: () => this.openMoveModal(),
+              condition: this.canEdit,
+              dataTest: 'move-selected-btn',
+            },
+            {
+              label: this.$tr('copySelectedButton'),
+              icon: 'clipboard',
+              onClick: () => this.copyToClipboard(this.selected),
+              condition: true,
+              dataTest: 'copy-selected-to-clipboard-btn',
+            },
+            {
+              label: this.$tr('duplicateSelectedButton'),
+              icon: 'copy',
+              onClick: () => this.duplicateNodes(this.selected),
+              condition: this.canEdit,
+              dataTest: 'duplicate-selected-btn',
+            },
+            {
+              label: this.$tr('sortAlphabetically'),
+              icon: 'sort',
+              onClick: () => this.sortNodes(this.selected),
+              condition: this.canEdit,
+              dataTest: 'sort-selected-btn',
+            },
+            {
+              label: this.$tr('deleteSelectedButton'),
+              icon: 'remove',
+              onClick: () => this.removeNodes(this.selected),
+              condition: this.canEdit,
+              dataTest: 'delete-selected-btn',
+            },
+          ],
+          [
+            {
+              label: this.$tr('editLanguageButton'),
+              icon: 'language',
+              onClick: this.quickEditModalFactory(QuickEditModals.LANGUAGE),
+              condition: this.canEdit,
+              dataTest: 'change-langugage-btn',
+            },
+          ],
+          [
+            {
+              label: this.$tr('editCategoriesButton'),
+              icon: 'categories',
+              onClick: this.quickEditModalFactory(QuickEditModals.CATEGORIES),
+              condition: this.canEdit,
+              dataTest: 'change-categories-btn',
+            },
+            {
+              label: this.$tr('editLevelsButton'),
+              icon: 'levels',
+              onClick: this.quickEditModalFactory(QuickEditModals.LEVELS),
+              condition: this.canEdit,
+              dataTest: 'change-levels-btn',
+            },
+            {
+              label: this.$tr('editLearningActivitiesButton'),
+              icon: 'activities',
+              onClick: this.quickEditModalFactory(QuickEditModals.LEARNING_ACTIVITIES),
+              condition: this.canEdit && this.isResourceSelected,
+              disabled: this.isTopicSelected,
+              dataTest: 'change-learning-activities-btn',
+            },
+          ],
+          [
+            {
+              label: this.$tr('editSourceButton'),
+              icon: 'attribution',
+              onClick: this.quickEditModalFactory(QuickEditModals.SOURCE),
+              condition: this.canEdit && this.isResourceSelected,
+              disabled: this.isTopicSelected,
+              dataTest: 'change-learning-activities-btn',
+            },
+            {
+              label: this.$tr('editAudienceButton'),
+              icon: 'audience',
+              onClick: this.quickEditModalFactory(QuickEditModals.AUDIENCE),
+              condition: this.canEdit && this.isResourceSelected,
+              disabled: this.isTopicSelected,
+              dataTest: 'change-audience-btn',
+            },
+            {
+              label: this.$tr('editWhatIsNeededButton'),
+              icon: 'lesson',
+              onClick: this.quickEditModalFactory(QuickEditModals.WHAT_IS_NEEDED),
+              condition: this.canEdit,
+              dataTest: 'change-resources-neded-btn',
+            },
+          ],
+        ];
+
+        const filteredOptions = groupedOptions
+          .filter(group => group.some(option => option.condition))
+          .map(group => group.filter(option => option.condition));
+
+        // Flatten the array with a divider between each group
+        return filteredOptions.reduce((acc, group, index) => {
+          if (index > 0) {
+            acc.push({ type: 'divider' });
+          }
+          return acc.concat(group);
+        }, []);
+      },
       height() {
         return this.hasStagingTree ? 'calc(100vh - 224px)' : 'calc(100vh - 160px)';
       },
       node() {
         return this.getContentNode(this.topicId);
       },
+      selectedNodes() {
+        return this.getContentNodes(this.selected);
+      },
+      isTopicSelected() {
+        return this.selectedNodes.some(node => node.kind === ContentKindsNames.TOPIC);
+      },
+      isResourceSelected() {
+        return this.selectedNodes.some(node => node.kind !== ContentKindsNames.TOPIC);
+      },
       ancestors() {
         return this.getContentNodeAncestors(this.topicId, true).map(ancestor => {
           return {
@@ -372,7 +501,7 @@
         };
       },
       selectionText() {
-        return this.$tr('selectionCount', this.getTopicAndResourceCounts(this.selected));
+        return this.getSelectedTopicAndResourceCountText(this.selected);
       },
       draggableId() {
         return DraggableRegions.TOPIC_VIEW;
@@ -389,6 +518,13 @@
           ? DropEffect.COPY
           : DropEffect.MOVE;
       },
+      dividerStyle() {
+        return {
+          height: '100%',
+          backgroundColor: this.$themeTokens.fineLine,
+          width: '1px',
+        };
+      },
     },
     watch: {
       topicId: {
@@ -436,6 +572,7 @@
         'moveContentNodes',
         'copyContentNode',
         'waitForCopyingStatus',
+        'setQuickEditModal',
       ]),
       ...mapActions('clipboard', ['copyAll']),
       clearSelections() {
@@ -524,6 +661,16 @@
           },
         });
       },
+      quickEditModalFactory(modal) {
+        return () => {
+          this.setQuickEditModal({
+            modal,
+            nodeIds: this.selected,
+          });
+          const trackActionLabel = modal.replace(/_/g, ' ').toLowerCase();
+          this.trackClickEvent(`Edit ${trackActionLabel}`);
+        };
+      },
       treeLink(params) {
         return {
           name: RouteNames.TREE_VIEW,
@@ -748,15 +895,27 @@
       trackViewMode(mode) {
         this.$analytics.trackAction('general', mode);
       },
+      showTitleDescriptionModal(nodeId) {
+        this.editTitleDescriptionModal = {
+          nodeId,
+        };
+      },
     },
     $trs: {
       addTopic: 'New folder',
-      SortAlphabetically: 'Sort alphabetically',
+      sortAlphabetically: 'Sort alphabetically',
       addExercise: 'New exercise',
       uploadFiles: 'Upload files',
       importFromChannels: 'Import from channels',
       addButton: 'Add',
       editButton: 'Edit',
+      editSourceButton: 'Edit Source',
+      editLevelsButton: 'Edit Levels',
+      editLanguageButton: 'Edit Language',
+      editAudienceButton: 'Edit Audience',
+      editCategoriesButton: 'Edit Categories',
+      editWhatIsNeededButton: "Edit 'What is needed'",
+      editLearningActivitiesButton: 'Edit Learning Activity',
       optionsButton: 'Options',
       copyToClipboardButton: 'Copy to clipboard',
       [viewModes.DEFAULT]: 'Default view',
@@ -767,8 +926,6 @@
       moveSelectedButton: 'Move',
       duplicateSelectedButton: 'Make a copy',
       deleteSelectedButton: 'Delete',
-      selectionCount:
-        '{topicCount, plural,\n =1 {# folder}\n other {# folders}}, {resourceCount, plural,\n =1 {# resource}\n other {# resources}}',
       undo: 'Undo',
       creatingCopies: 'Copying...',
       copiedItems: 'Copy operation complete',
@@ -794,4 +951,18 @@
   .fade-transition-leave-active {
     transition-duration: 0.1s
   }
+
+  .divider-wrapper {
+    padding: 8px 12px;
+    align-self: stretch;
+  }
+  .command-palette-wrapper {
+    min-width: 0;
+    flex-grow: 1;
+    padding-right: 4px;
+  }
+  .no-shrink {
+    flex-shrink: 0;
+  }
+
 </style>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/NodePanel.vue b/contentcuration/contentcuration/frontend/channelEdit/views/NodePanel.vue
index aca3ee7e5e..8572c8eb51 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/NodePanel.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/NodePanel.vue
@@ -41,9 +41,11 @@
           @infoClick="goToNodeDetail(child.id)"
           @topicChevronClick="goToTopic(child.id)"
           @dblclick.native="onNodeDoubleClick(child)"
+          @editTitleDescription="$emit('editTitleDescription', child.id)"
         />
       </template>
     </VList>
+    <slot name="pagination"></slot>
   </div>
 
 </template>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue b/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue
index 61c0bb34ac..b2c3825799 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue
@@ -221,6 +221,10 @@
       :channel="currentChannel"
       @syncing="syncInProgress"
     />
+    <QuickEditModal />
+    <AboutLicensesModal
+      v-if="isAboutLicensesModalOpen"
+    />
     <MessageDialog
       v-model="showDeleteModal"
       :header="$tr('deleteTitle')"
@@ -309,6 +313,7 @@
   import SyncResourcesModal from '../sync/SyncResourcesModal';
   import ProgressModal from '../progress/ProgressModal';
   import PublishModal from '../../components/publish/PublishModal';
+  import QuickEditModal from '../../components/QuickEditModal';
   import SavingIndicator from '../../components/edit/SavingIndicator';
   import { DraggableRegions, DraggableUniverses, RouteNames } from '../../constants';
   import MainNavigationDrawer from 'shared/views/MainNavigationDrawer';
@@ -316,6 +321,7 @@
   import ChannelTokenModal from 'shared/views/channel/ChannelTokenModal';
   import OfflineText from 'shared/views/OfflineText';
   import ContentNodeIcon from 'shared/views/ContentNodeIcon';
+  import AboutLicensesModal from 'shared/views/AboutLicensesModal';
   import MessageDialog from 'shared/views/MessageDialog';
   import { RouteNames as ChannelRouteNames } from 'frontend/channelList/constants';
   import { titleMixin } from 'shared/mixins';
@@ -339,6 +345,8 @@
       DraggablePlaceholder,
       MessageDialog,
       SavingIndicator,
+      QuickEditModal,
+      AboutLicensesModal,
     },
     mixins: [titleMixin],
     props: {
@@ -362,6 +370,7 @@
       ...mapState({
         offline: state => !state.connection.online,
       }),
+      ...mapGetters(['isAboutLicensesModalOpen']),
       ...mapGetters('contentNode', ['getContentNode']),
       ...mapGetters('currentChannel', ['currentChannel', 'canEdit', 'canManage', 'rootId']),
       rootNode() {
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/index.spec.js b/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/index.spec.js
index 470e67a89d..4ec3d01d61 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/index.spec.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/index.spec.js
@@ -22,7 +22,7 @@ const GETTERS = {
     canManage: jest.fn(() => true),
   },
   contentNode: {
-    getContentNodeChildren: () => jest.fn(() => []),
+    getContentNodeChildren: () => jest.fn(() => ({ results: [], more: null })),
     getContentNodeAncestors: () => jest.fn(() => []),
     getContentNode: () => jest.fn(() => ({})),
     getTopicAndResourceCounts: () => jest.fn(() => ({ topicCount: 0, resourceCount: 0 })),
@@ -35,7 +35,7 @@ const ACTIONS = {
     loadContentNode: jest.fn(),
     headContentNode: () => jest.fn(),
     loadContentNodes: jest.fn(),
-    loadChildren: jest.fn(),
+    loadChildren: jest.fn(() => ({ results: [], more: null })),
   },
 };
 
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/index.vue b/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/index.vue
index 09d63289b1..6c33b6aa9d 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/index.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/index.vue
@@ -136,6 +136,13 @@
             />
           </div>
         </template>
+        <template #pagination>
+          <div class="pagination-container">
+            <KButton v-if="more" :disabled="moreLoading" @click="loadMore">
+              {{ $tr('showMore') }}
+            </KButton>
+          </div>
+        </template>
       </CurrentTopicView>
     </VContent>
   </TreeViewBase>
@@ -198,6 +205,8 @@
         },
         loading: true,
         listElevated: false,
+        more: null,
+        moreLoading: false,
       };
     },
     computed: {
@@ -291,25 +300,30 @@
       },
     },
     created() {
-      let childrenPromise;
-      // If viewing the root-level node, don't request anything, since the NodePanel.created
-      // hook will make a redundant request
-      if (this.nodeId === this.rootId) {
-        childrenPromise = Promise.resolve();
-      } else {
-        childrenPromise = this.loadContentNodes({ parent: this.rootId });
-      }
-      Promise.all([childrenPromise, this.loadAncestors({ id: this.nodeId })]).then(() => {
-        this.loading = false;
-        this.jumpToLocation();
-      });
+      const childrenPromise = this.loadChildren({ parent: this.rootId });
+      Promise.all([childrenPromise, this.loadAncestors({ id: this.nodeId })]).then(
+        ([childrenResponse]) => {
+          this.loading = false;
+          this.more = childrenResponse.more || null;
+          this.jumpToLocation();
+        }
+      );
     },
     methods: {
       ...mapMutations('contentNode', {
         collapseAll: 'COLLAPSE_ALL_EXPANDED',
         setExpanded: 'SET_EXPANSION',
       }),
-      ...mapActions('contentNode', ['loadAncestors', 'loadContentNodes']),
+      ...mapActions('contentNode', ['loadAncestors', 'loadChildren', 'loadContentNodes']),
+      loadMore() {
+        if (this.more && !this.moreLoading) {
+          this.moreLoading = true;
+          this.loadContentNodes(this.more).then(response => {
+            this.more = response.more || null;
+            this.moreLoading = false;
+          });
+        }
+      },
       verifyContentNodeId(id) {
         this.nodeNotFound = false;
         return this.$store.dispatch('contentNode/headContentNode', id).catch(() => {
@@ -406,6 +420,7 @@
       openCurrentLocationButton: 'Expand to current folder location',
       updatedResourcesReadyForReview: 'Updated resources are ready for review',
       closeDrawer: 'Close',
+      showMore: 'Show more',
     },
   };
 
@@ -445,4 +460,10 @@
     }
   }
 
+  .pagination-container {
+    display: flex;
+    justify-content: flex-start;
+    margin: 4px;
+  }
+
 </style>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/trash/TrashModal.vue b/contentcuration/contentcuration/frontend/channelEdit/views/trash/TrashModal.vue
index a00c9e2b55..c18a221f1e 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/trash/TrashModal.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/trash/TrashModal.vue
@@ -78,7 +78,7 @@
     </VContent>
     <template #bottom>
       <span v-if="selected.length" class="mr-4 subheading">
-        {{ $tr('selectedCountText', counts) }}
+        {{ getSelectedTopicAndResourceCountText(selected) }}
       </span>
       <VSpacer />
       <VBtn
@@ -167,7 +167,11 @@
     },
     computed: {
       ...mapGetters('currentChannel', ['currentChannel', 'trashId', 'rootId']),
-      ...mapGetters('contentNode', ['getContentNodeChildren', 'getTopicAndResourceCounts']),
+      ...mapGetters('contentNode', [
+        'getContentNodeChildren',
+        'getTopicAndResourceCounts',
+        'getSelectedTopicAndResourceCountText',
+      ]),
       headers() {
         return [
           {
@@ -261,8 +265,6 @@
       trashEmptySubtext: 'Resources removed from this channel will appear here',
       selectAllHeader: 'Select all',
       deletedHeader: 'Removed',
-      selectedCountText:
-        '{topicCount, plural,\n =1 {# folder}\n other {# folders}}, {resourceCount, plural,\n =1 {# resource}\n other {# resources}}',
       deleteButton: 'Delete',
       restoreButton: 'Restore',
       deleteConfirmationHeader:
diff --git a/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/__tests__/actions.spec.js b/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/__tests__/actions.spec.js
index 8f0767beeb..eedfa8a763 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/__tests__/actions.spec.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/__tests__/actions.spec.js
@@ -4,6 +4,7 @@ import assessmentItem from '../../assessmentItem/index';
 import file from 'shared/vuex/file';
 import { ContentNode } from 'shared/data/resources';
 import storeFactory from 'shared/vuex/baseStore';
+import { ContentKindsNames } from 'shared/leUtils/ContentKinds';
 import { mockChannelScope, resetMockChannelScope } from 'shared/utils/testing';
 
 jest.mock('../../currentChannel/index');
@@ -137,6 +138,85 @@ describe('contentNode actions', () => {
         });
     });
   });
+  describe('updateContentNodeDescendants', () => {
+    const nodeIdToUpdate = '0000-1111-2222-3333';
+    const topicContentNode = '0000-0000-1111-2222';
+    const nonTopicContentNode = '0000-0000-1111-1111';
+    beforeEach(async () => {
+      store.commit('contentNode/ADD_CONTENTNODES', [
+        {
+          id: nodeIdToUpdate,
+          title: 'test',
+          language: 'en',
+          kind: ContentKindsNames.TOPIC,
+        },
+        {
+          id: topicContentNode,
+          title: 'test nonTopic',
+          kind: ContentKindsNames.TOPIC,
+          parent: nodeIdToUpdate,
+        },
+        {
+          id: nonTopicContentNode,
+          title: 'test nonTopic',
+          kind: ContentKindsNames.VIDEO,
+          parent: topicContentNode,
+        },
+      ]);
+    });
+    afterEach(() => {
+      store.commit('contentNode/REMOVE_CONTENTNODE', nodeIdToUpdate);
+      store.commit('contentNode/REMOVE_CONTENTNODE', topicContentNode);
+      store.commit('contentNode/REMOVE_CONTENTNODE', nonTopicContentNode);
+    });
+    it('should throw an error if we try to update the descendants of a non-Topic node', () => {
+      expect(() => {
+        store.dispatch('contentNode/updateContentNodeDescendants', {
+          id: nonTopicContentNode,
+          language: 'es',
+        });
+      }).toThrow();
+    });
+    it('should throw an error if we try to update the title of all descendants', () => {
+      expect(() => {
+        store.dispatch('contentNode/updateContentNodeDescendants', {
+          id: nodeIdToUpdate,
+          title: 'notatest',
+        });
+      }).toThrow();
+    });
+    it('should call mutate the language of the descendants content nodes', async () => {
+      const newLang = 'es';
+      await store.dispatch('contentNode/updateContentNodeDescendants', {
+        id: nodeIdToUpdate,
+        language: newLang,
+      });
+
+      const updatedContentNode = store.getters['contentNode/getContentNode'](nodeIdToUpdate);
+      expect(updatedContentNode.language).toEqual(newLang);
+
+      const descendants = [topicContentNode, nonTopicContentNode];
+      descendants.forEach(descendant => {
+        const updatedDescendant = store.getters['contentNode/getContentNode'](descendant);
+        expect(updatedDescendant.language).toEqual(newLang);
+      });
+    });
+    it('should call "ContentNode.updateDescendants" with the language update', async () => {
+      const updateDescendantsSpy = jest.spyOn(ContentNode, 'updateDescendants');
+      const newLang = 'es';
+      await store.dispatch('contentNode/updateContentNodeDescendants', {
+        id: nodeIdToUpdate,
+        language: newLang,
+      });
+
+      expect(updateDescendantsSpy).toHaveBeenCalledWith(
+        nodeIdToUpdate,
+        expect.objectContaining({
+          language: newLang,
+        })
+      );
+    });
+  });
   describe('addTags action', () => {
     it('should call ContetnNode.update', () => {
       const updateSpy = jest.spyOn(ContentNode, 'update');
diff --git a/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/actions.js b/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/actions.js
index da647bfecc..6c42af8974 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/actions.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/actions.js
@@ -1,6 +1,6 @@
 import flatMap from 'lodash/flatMap';
 import uniq from 'lodash/uniq';
-import { NEW_OBJECT, NOVALUE } from 'shared/constants';
+import { NEW_OBJECT, NOVALUE, DescendantsUpdatableFields } from 'shared/constants';
 import client from 'shared/client';
 import {
   RELATIVE_TREE_POSITIONS,
@@ -19,9 +19,10 @@ import * as publicApi from 'shared/data/public';
 import db from 'shared/data/db';
 
 export function loadContentNodes(context, params = {}) {
-  return ContentNode.where(params).then(contentNodes => {
+  return ContentNode.where(params).then(response => {
+    const contentNodes = response.results ? response.results : response;
     context.commit('ADD_CONTENTNODES', contentNodes);
-    return contentNodes;
+    return response;
   });
 }
 
@@ -70,7 +71,7 @@ export function loadContentNodeByNodeId(context, nodeId) {
 }
 
 export function loadChildren(context, { parent, published = null, complete = null }) {
-  const params = { parent };
+  const params = { parent, max_results: 25 };
   if (published !== null) {
     params.published = published;
   }
@@ -382,6 +383,41 @@ export function updateContentNode(context, { id, ...payload } = {}) {
   return ContentNode.update(id, contentNodeData);
 }
 
+/**
+ * Update a content node and all its descendants with the given payload.
+ * @param {*} context
+ * @param {string} param.id Id of the parent content to edit. It must be a topic.
+ */
+export function updateContentNodeDescendants(context, { id, ...payload } = {}) {
+  if (!id) {
+    throw ReferenceError('id must be defined to update a contentNode and its descendants');
+  }
+
+  const node = context.getters.getContentNode(id);
+  if (!node || node.kind !== ContentKindsNames.TOPIC) {
+    throw TypeError('Only topics can have descendants');
+  }
+
+  for (const field in payload) {
+    if (!DescendantsUpdatableFields.includes(field)) {
+      throw TypeError(`Cannot update field ${field} on all descendants`);
+    }
+  }
+
+  const contentNodeData = generateContentNodeData(payload);
+
+  const descendants = context.getters.getContentNodeDescendants(id);
+  const contentNodeIds = [id, ...descendants.map(node => node.id)];
+
+  const contentNodesData = contentNodeIds.map(contentNodeId => ({
+    id: contentNodeId,
+    ...contentNodeData,
+  }));
+
+  context.commit('ADD_CONTENTNODES', contentNodesData);
+  return ContentNode.updateDescendants(id, contentNodeData);
+}
+
 export function addTags(context, { ids, tags }) {
   return Promise.all(
     ids.map(id => {
@@ -513,3 +549,7 @@ export async function checkSavingProgress(
     .first();
   return Boolean(query);
 }
+
+export function setQuickEditModal(context, open) {
+  context.commit('SET_QUICK_EDIT_MODAL', open);
+}
diff --git a/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/getters.js b/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/getters.js
index ba594da164..4cbcadace2 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/getters.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/getters.js
@@ -3,6 +3,7 @@ import sortBy from 'lodash/sortBy';
 import uniq from 'lodash/uniq';
 import uniqBy from 'lodash/uniqBy';
 
+import messages from '../../translator';
 import { parseNode } from './utils';
 import { getNodeDetailsErrors, getNodeFilesErrors } from 'shared/utils/validation';
 import { ContentKindsNames } from 'shared/leUtils/ContentKinds';
@@ -104,6 +105,13 @@ export function getTopicAndResourceCounts(state, getters) {
   };
 }
 
+export function getSelectedTopicAndResourceCountText(state, getters) {
+  return function(contentNodeIds) {
+    const { topicCount, resourceCount } = getters.getTopicAndResourceCounts(contentNodeIds);
+    return messages.$tr('selectionCount', { topicCount, resourceCount });
+  };
+}
+
 export function getContentNodeChildren(state, getters) {
   return function(contentNodeId) {
     return sorted(
@@ -351,3 +359,9 @@ export function nodeExpanded(state) {
     return Boolean(state.expandedNodes[id]);
   };
 }
+
+export function getQuickEditModalOpen(state) {
+  return function() {
+    return state.quickEditModalOpen;
+  };
+}
diff --git a/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/index.js b/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/index.js
index 5fa6d1faba..363020d731 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/index.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/index.js
@@ -15,6 +15,18 @@ export default {
       contentNodesMap: {},
       expandedNodes,
 
+      /**
+       * Object to store information about the current quick edit modal opened.
+       * Making this part of the vuex store as the quick edit modal can be opened
+       * from multiple places and deep in the tree.
+       *
+       * This object contains the following properties:
+       * - nodeIds: the ids of the nodes to be edited
+       * - modal: The name of the quick edit modal being
+       *          opened (from the "QuickEditModals" object in constants.js)
+       */
+      quickEditModalOpen: null,
+
       /*
         Making this part of the vuex store as it seems like the cleanest solution for
         managing moving nodes. Alternative solutions are:
diff --git a/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/mutations.js b/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/mutations.js
index 18e6cb9272..e872f63a4d 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/mutations.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/mutations.js
@@ -2,9 +2,11 @@ import Vue from 'vue';
 import isEmpty from 'lodash/isEmpty';
 import { NEW_OBJECT } from 'shared/constants';
 import { mergeMapItem } from 'shared/vuex/utils';
+import { cleanBooleanMaps } from 'shared/utils/helpers';
 import { applyMods } from 'shared/data/applyRemoteChanges';
 
 export function ADD_CONTENTNODE(state, contentNode) {
+  cleanBooleanMaps(contentNode);
   state.contentNodesMap = mergeMapItem(state.contentNodesMap, contentNode);
 }
 
@@ -18,7 +20,9 @@ export function UPDATE_CONTENTNODE_FROM_INDEXEDDB(state, { id, ...updates }) {
   if (id && state.contentNodesMap[id]) {
     // Need to do object spread to return a new object for setting in the map
     // otherwise nested changes will not trigger reactive updates
-    Vue.set(state.contentNodesMap, id, { ...applyMods(state.contentNodesMap[id], updates) });
+    const contentNode = { ...applyMods(state.contentNodesMap[id], updates) };
+    cleanBooleanMaps(contentNode);
+    Vue.set(state.contentNodesMap, id, contentNode);
   }
 }
 
@@ -74,6 +78,10 @@ export function SET_MOVE_NODES(state, ids) {
   state.moveNodes = ids;
 }
 
+export function SET_QUICK_EDIT_MODAL(state, quickEditModalOpen) {
+  state.quickEditModalOpen = quickEditModalOpen;
+}
+
 /**
  * Remove an entry from the prerequisite mappings.
  */
diff --git a/contentcuration/contentcuration/frontend/channelEdit/vuex/currentChannel/__tests__/module.spec.js b/contentcuration/contentcuration/frontend/channelEdit/vuex/currentChannel/__tests__/module.spec.js
index f43043649a..cbad4da235 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/vuex/currentChannel/__tests__/module.spec.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/vuex/currentChannel/__tests__/module.spec.js
@@ -31,5 +31,23 @@ describe('currentChannel store', () => {
         spy.mockRestore();
       });
     });
+    it('channelLanguageExistsInResources action should call `language_exists` endpoint', () => {
+      const spy = jest
+        .spyOn(Channel, 'languageExistsInResources')
+        .mockImplementation(() => Promise.resolve());
+      return store.dispatch('currentChannel/channelLanguageExistsInResources').then(() => {
+        expect(spy.mock.calls[0][0]).toBe(store.state.currentChannel.currentChannelId);
+        spy.mockRestore();
+      });
+    });
+    it('getLanguagesInChannelResources action should call `languages` endpoint', () => {
+      const spy = jest
+        .spyOn(Channel, 'languagesInResources')
+        .mockImplementation(() => Promise.resolve());
+      return store.dispatch('currentChannel/getLanguagesInChannelResources').then(() => {
+        expect(spy.mock.calls[0][0]).toBe(store.state.currentChannel.currentChannelId);
+        spy.mockRestore();
+      });
+    });
   });
 });
diff --git a/contentcuration/contentcuration/frontend/channelEdit/vuex/currentChannel/actions.js b/contentcuration/contentcuration/frontend/channelEdit/vuex/currentChannel/actions.js
index 9dca09a0a2..d640b905af 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/vuex/currentChannel/actions.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/vuex/currentChannel/actions.js
@@ -54,3 +54,13 @@ export function deployCurrentChannel(context) {
 export function publishChannel(context, version_notes) {
   return Channel.publish(context.state.currentChannelId, version_notes);
 }
+
+export function channelLanguageExistsInResources(context) {
+  const channelId = context.state.currentChannelId;
+  return Channel.languageExistsInResources(channelId);
+}
+
+export function getLanguagesInChannelResources(context) {
+  const channelId = context.state.currentChannelId;
+  return Channel.languagesInResources(channelId);
+}
diff --git a/contentcuration/contentcuration/frontend/channelList/views/ChannelSet/ChannelItem.vue b/contentcuration/contentcuration/frontend/channelList/views/ChannelSet/ChannelItem.vue
index 879ca23a3b..22a3eaeb57 100644
--- a/contentcuration/contentcuration/frontend/channelList/views/ChannelSet/ChannelItem.vue
+++ b/contentcuration/contentcuration/frontend/channelList/views/ChannelSet/ChannelItem.vue
@@ -1,6 +1,6 @@
 <template>
 
-  <VLayout v-if="channel" align-center wrap class="pa-2">
+  <VLayout v-if="channel" align-center wrap class="pa-2" @click="handleClick">
     <VFlex class="pa-2" xs12 sm4 md3 lg2>
       <Thumbnail :src="channel.thumbnail_url" />
     </VFlex>
@@ -47,6 +47,11 @@
         return this.getChannel(this.channelId);
       },
     },
+    methods: {
+      handleClick() {
+        this.$emit('click', this.channelId);
+      },
+    },
     $trs: {
       versionText: 'Version {version}',
     },
diff --git a/contentcuration/contentcuration/frontend/channelList/views/ChannelSet/ChannelSelectionList.vue b/contentcuration/contentcuration/frontend/channelList/views/ChannelSet/ChannelSelectionList.vue
index ad99cf646b..d6b5b39198 100644
--- a/contentcuration/contentcuration/frontend/channelList/views/ChannelSet/ChannelSelectionList.vue
+++ b/contentcuration/contentcuration/frontend/channelList/views/ChannelSet/ChannelSelectionList.vue
@@ -21,15 +21,20 @@
           hover
           class="list-card-hover px-3"
         >
-          <Checkbox
-            v-model="selectedChannels"
-            color="primary"
-            :data-test="`checkbox-${channel.id}`"
-            :value="channel.id"
-            class="channel ma-0"
-          >
-            <ChannelItem :channelId="channel.id" />
-          </Checkbox>
+          <VLayout align-center row>
+            <Checkbox
+              v-model="selectedChannels"
+              color="primary"
+              :data-test="`checkbox-${channel.id}`"
+              :value="channel.id"
+              class="channel ma-0"
+            />
+            <ChannelItem
+              :channelId="channel.id"
+              :data-test="`channel-item-${channel.id}`"
+              @click="handleSelectChannel"
+            />
+          </VLayout>
         </VCard>
       </template>
     </template>
@@ -112,6 +117,11 @@
     },
     methods: {
       ...mapActions('channel', ['loadChannelList']),
+      handleSelectChannel(channelId) {
+        this.selectedChannels = this.selectedChannels.includes(channelId)
+          ? this.selectedChannels.filter(id => id !== channelId)
+          : [...this.selectedChannels, channelId];
+      },
     },
     $trs: {
       searchText: 'Search for a channel',
diff --git a/contentcuration/contentcuration/frontend/channelList/views/ChannelSet/__tests__/channelSelectionList.spec.js b/contentcuration/contentcuration/frontend/channelList/views/ChannelSet/__tests__/channelSelectionList.spec.js
index efdcbf96f5..b35725f43a 100644
--- a/contentcuration/contentcuration/frontend/channelList/views/ChannelSet/__tests__/channelSelectionList.spec.js
+++ b/contentcuration/contentcuration/frontend/channelList/views/ChannelSet/__tests__/channelSelectionList.spec.js
@@ -1,4 +1,5 @@
 import { mount } from '@vue/test-utils';
+import Vuex from 'vuex';
 import ChannelSelectionList from '../ChannelSelectionList';
 import { ChannelListTypes } from 'shared/constants';
 
@@ -25,6 +26,25 @@ const publicChannel = {
   published: true,
 };
 
+const getters = {
+  channels: jest.fn(() => [editChannel, editChannel2, publicChannel]),
+  getChannel: jest.fn(() => () => editChannel),
+};
+
+const actions = {
+  loadChannelList: jest.fn(() => Promise.resolve()),
+};
+
+const store = new Vuex.Store({
+  modules: {
+    channel: {
+      namespaced: true,
+      getters,
+      actions,
+    },
+  },
+});
+
 function makeWrapper() {
   return mount(ChannelSelectionList, {
     sync: false,
@@ -41,9 +61,7 @@ function makeWrapper() {
         return Promise.resolve();
       },
     },
-    stubs: {
-      ChannelItem: true,
-    },
+    store,
   });
 }
 
@@ -77,4 +95,17 @@ describe('channelSelectionList', () => {
     expect(wrapper.vm.listChannels.find(c => c.id === editChannel.id)).toBeTruthy();
     expect(wrapper.vm.listChannels.find(c => c.id === editChannel2.id)).toBeFalsy();
   });
+  it('should select channels when the channel card has been clicked', () => {
+    wrapper.setData({ loading: false });
+    wrapper.find(`[data-test="channel-item-${editChannel.id}"]`).trigger('click');
+    expect(wrapper.emitted('input')[0][0]).toEqual([editChannel.id]);
+  });
+  it('should deselect channels when the channel card has been clicked', () => {
+    wrapper.setData({ loading: false });
+    wrapper.find(`[data-test="channel-item-${editChannel.id}"]`).element.click(); // Check the channel
+    wrapper.find(`[data-test="channel-item-${editChannel.id}"]`).element.click(); // Uncheck the channel
+
+    expect(wrapper.emitted('input')[0].length).toEqual(1); // Only one event should be emitted (corresponding to the initial check)
+    expect(wrapper.emitted('input')[0][0]).toEqual([editChannel.id]); // The initial check event should be emitted
+  });
 });
diff --git a/contentcuration/contentcuration/frontend/settings/pages/Account/ChangePasswordForm.vue b/contentcuration/contentcuration/frontend/settings/pages/Account/ChangePasswordForm.vue
index 82ed1bcadb..8394fb4e2c 100644
--- a/contentcuration/contentcuration/frontend/settings/pages/Account/ChangePasswordForm.vue
+++ b/contentcuration/contentcuration/frontend/settings/pages/Account/ChangePasswordForm.vue
@@ -8,9 +8,11 @@
     @submit="submitPassword"
     @cancel="dialog = false"
   >
-    <VForm ref="form">
+    <!-- inline style here avoids scrollbar on validations -->
+    <VForm ref="form" style="height: 196px">
       <PasswordField
         v-model="password"
+        :additionalRules="passwordValidationRules"
         :label="$tr('newPasswordLabel')"
       />
       <PasswordField
@@ -52,6 +54,9 @@
           this.$emit('input', value);
         },
       },
+      passwordValidationRules() {
+        return [value => (value.length >= 8 ? true : this.$tr('passwordValidationMessage'))];
+      },
       passwordConfirmRules() {
         return [value => (this.password === value ? true : this.$tr('formInvalidText'))];
       },
@@ -86,6 +91,7 @@
       newPasswordLabel: 'New password',
       confirmNewPasswordLabel: 'Confirm new password',
       formInvalidText: "Passwords don't match",
+      passwordValidationMessage: 'Password should be at least 8 characters long',
       cancelAction: 'Cancel',
       saveChangesAction: 'Save changes',
       paswordChangeSuccess: 'Password updated',
diff --git a/contentcuration/contentcuration/frontend/settings/pages/UsingStudio/index.vue b/contentcuration/contentcuration/frontend/settings/pages/UsingStudio/index.vue
index 2ede4e3834..e82a7086ef 100644
--- a/contentcuration/contentcuration/frontend/settings/pages/UsingStudio/index.vue
+++ b/contentcuration/contentcuration/frontend/settings/pages/UsingStudio/index.vue
@@ -87,21 +87,19 @@
 
 <script>
 
-  import { mapActions } from 'vuex';
   import { policies } from 'shared/constants';
 
   export default {
     name: 'UsingStudio',
     methods: {
-      ...mapActions('policies', ['openPolicy']),
       showTermsOfService() {
-        this.openPolicy(policies.TERMS_OF_SERVICE);
+        this.$router.push({ query: { showPolicy: policies.TERMS_OF_SERVICE } });
       },
       showPrivacyPolicy() {
-        this.openPolicy(policies.PRIVACY);
+        this.$router.push({ query: { showPolicy: policies.PRIVACY } });
       },
       showCommunityStandards() {
-        this.openPolicy(policies.COMMUNITY_STANDARDS);
+        this.$router.push({ query: { showPolicy: policies.COMMUNITY_STANDARDS } });
       },
     },
     $trs: {
diff --git a/contentcuration/contentcuration/frontend/settings/pages/__tests__/usingStudio.spec.js b/contentcuration/contentcuration/frontend/settings/pages/__tests__/usingStudio.spec.js
index b53d56737a..b88c070baa 100644
--- a/contentcuration/contentcuration/frontend/settings/pages/__tests__/usingStudio.spec.js
+++ b/contentcuration/contentcuration/frontend/settings/pages/__tests__/usingStudio.spec.js
@@ -1,11 +1,16 @@
 import Vuex, { Store } from 'vuex';
+import VueRouter from 'vue-router';
 import { mount, createLocalVue } from '@vue/test-utils';
+import router from '../../../accounts/router';
 
 import UsingStudio from '../UsingStudio/index';
 import { policies } from 'shared/constants';
 
 const localVue = createLocalVue();
 localVue.use(Vuex);
+localVue.use(VueRouter);
+
+jest.spyOn(router, 'push');
 
 function makeWrapper({ methods = {} } = {}) {
   const store = new Store({
@@ -18,34 +23,35 @@ function makeWrapper({ methods = {} } = {}) {
       },
     },
   });
-
   return mount(UsingStudio, {
     localVue,
     store,
     methods,
+    router,
     stubs: ['PolicyModals'],
   });
 }
 
 describe('usingStudio tab', () => {
   let wrapper;
-  let openPolicy;
 
   beforeEach(() => {
-    openPolicy = jest.fn();
-    wrapper = makeWrapper({ methods: { openPolicy } });
+    wrapper = makeWrapper();
   });
 
   it('clicking privacy link should open policies modal', () => {
     wrapper.find('[data-test="policy-link"]').trigger('click');
-    expect(openPolicy).toHaveBeenCalledWith(policies.PRIVACY);
+    const query = { query: { showPolicy: policies.PRIVACY } };
+    expect(wrapper.vm.$router.push).toHaveBeenCalledWith(query);
   });
   it('clicking terms of service link should open tos modal', () => {
     wrapper.find('[data-test="tos-link"]').trigger('click');
-    expect(openPolicy).toHaveBeenCalledWith(policies.TERMS_OF_SERVICE);
+    const query = { query: { showPolicy: policies.TERMS_OF_SERVICE } };
+    expect(wrapper.vm.$router.push).toHaveBeenCalledWith(query);
   });
   it('clicking community standards link should open standards modal', () => {
     wrapper.find('[data-test="communitystandards-link"]').trigger('click');
-    expect(openPolicy).toHaveBeenCalledWith(policies.COMMUNITY_STANDARDS);
+    const query = { query: { showPolicy: policies.COMMUNITY_STANDARDS } };
+    expect(wrapper.vm.$router.push).toHaveBeenCalledWith(query);
   });
 });
diff --git a/contentcuration/contentcuration/frontend/shared/app.js b/contentcuration/contentcuration/frontend/shared/app.js
index 9399eb2e55..4823894bdb 100644
--- a/contentcuration/contentcuration/frontend/shared/app.js
+++ b/contentcuration/contentcuration/frontend/shared/app.js
@@ -106,6 +106,7 @@ import {
 } from 'vuetify/lib/directives';
 import VueIntl from 'vue-intl';
 import Croppa from 'vue-croppa';
+import VueCompositionApi from '@vue/composition-api';
 import { Workbox, messageSW } from 'workbox-window';
 import KThemePlugin from 'kolibri-design-system/lib/KThemePlugin';
 import trackInputModality from 'kolibri-design-system/lib/styles/trackInputModality';
@@ -121,6 +122,7 @@ import Base from 'shared/Base.vue';
 import urls from 'shared/urls';
 import ActionLink from 'shared/views/ActionLink';
 import Menu from 'shared/views/Menu';
+import Divider from 'shared/views/Divider';
 import { initializeDB, resetDB } from 'shared/data';
 import { Session, injectVuexStore } from 'shared/data/resources';
 
@@ -158,6 +160,7 @@ if (process.env.NODE_ENV !== 'production') {
 Vue.use(Croppa);
 Vue.use(VueIntl);
 Vue.use(VueRouter);
+Vue.use(VueCompositionApi);
 Vue.use(Vuetify, {
   components: {
     // Explicitly register used Vuetify components globally
@@ -256,6 +259,7 @@ Vue.use(AnalyticsPlugin, { dataLayer: window.dataLayer });
 // Register global components
 Vue.component('ActionLink', ActionLink);
 Vue.component('Menu', Menu);
+Vue.component('Divider', Divider);
 
 function initiateServiceWorker() {
   // Second conditional must be removed if you are doing dev work on the service
diff --git a/contentcuration/contentcuration/frontend/shared/constants.js b/contentcuration/contentcuration/frontend/shared/constants.js
index 0bff20ea2b..57d3bffa8e 100644
--- a/contentcuration/contentcuration/frontend/shared/constants.js
+++ b/contentcuration/contentcuration/frontend/shared/constants.js
@@ -2,6 +2,7 @@ import invert from 'lodash/invert';
 import Subjects from 'kolibri-constants/labels/Subjects';
 import CompletionCriteria from 'kolibri-constants/CompletionCriteria';
 import ContentLevels from 'kolibri-constants/labels/Levels';
+import { ContentKindsNames } from 'shared/leUtils/ContentKinds';
 import featureFlagsSchema from 'static/feature_flags.json';
 
 export { default as LearningActivities } from 'kolibri-constants/labels/LearningActivities';
@@ -217,3 +218,87 @@ export const DurationDropdownMap = {
 // Define an object to act as the place holder for non unique values.
 export const nonUniqueValue = {};
 nonUniqueValue.toString = () => '';
+
+/**
+ * Not all fields are updatable on descendants, for many of them does not
+ * make sense to update to all the descendants, such as the title.
+ */
+export const DescendantsUpdatableFields = [
+  'language',
+  'categories',
+  'grade_levels',
+  'learner_needs',
+];
+
+export const ResourcesNeededOptions = [
+  'PEERS',
+  'TEACHER',
+  'INTERNET',
+  'SPECIAL_SOFTWARE',
+  'PAPER_PENCIL',
+  'OTHER_SUPPLIES',
+];
+
+// The constant mapping below is used to set
+// default completion criteria and durations
+// both as initial values in the edit modal, and
+// to ensure backwards compatibility for contentnodes
+// that were added before this was in place
+export const defaultCompletionCriteriaModels = {
+  [ContentKindsNames.VIDEO]: CompletionCriteria.TIME,
+  [ContentKindsNames.AUDIO]: CompletionCriteria.TIME,
+  [ContentKindsNames.DOCUMENT]: CompletionCriteria.PAGES,
+  [ContentKindsNames.H5P]: CompletionCriteria.DETERMINED_BY_RESOURCE,
+  [ContentKindsNames.HTML5]: CompletionCriteria.APPROX_TIME,
+  [ContentKindsNames.ZIM]: CompletionCriteria.APPROX_TIME,
+  [ContentKindsNames.EXERCISE]: CompletionCriteria.MASTERY,
+};
+
+export const defaultCompletionCriteriaThresholds = {
+  // Audio and Video threshold defaults are dynamic based
+  // on the duration of the file itself.
+  [ContentKindsNames.DOCUMENT]: '100%',
+  [ContentKindsNames.HTML5]: 300,
+  // We cannot set an automatic default threshold for exercises.
+};
+
+export const CompletionOptionsDropdownMap = {
+  [ContentKindsNames.DOCUMENT]: [
+    CompletionDropdownMap.allContent,
+    CompletionDropdownMap.completeDuration,
+    CompletionDropdownMap.reference,
+  ],
+  [ContentKindsNames.EXERCISE]: [CompletionDropdownMap.goal, CompletionDropdownMap.practiceQuiz],
+  [ContentKindsNames.HTML5]: [
+    CompletionDropdownMap.completeDuration,
+    CompletionDropdownMap.determinedByResource,
+    CompletionDropdownMap.reference,
+  ],
+  [ContentKindsNames.ZIM]: [
+    CompletionDropdownMap.completeDuration,
+    CompletionDropdownMap.determinedByResource,
+    CompletionDropdownMap.reference,
+  ],
+  [ContentKindsNames.H5P]: [
+    CompletionDropdownMap.determinedByResource,
+    CompletionDropdownMap.completeDuration,
+    CompletionDropdownMap.reference,
+  ],
+  [ContentKindsNames.VIDEO]: [
+    CompletionDropdownMap.completeDuration,
+    CompletionDropdownMap.reference,
+  ],
+  [ContentKindsNames.AUDIO]: [
+    CompletionDropdownMap.completeDuration,
+    CompletionDropdownMap.reference,
+  ],
+};
+
+export const completionCriteriaToDropdownMap = {
+  [CompletionCriteria.TIME]: CompletionDropdownMap.completeDuration,
+  [CompletionCriteria.APPROX_TIME]: CompletionDropdownMap.completeDuration,
+  [CompletionCriteria.PAGES]: CompletionDropdownMap.allContent,
+  [CompletionCriteria.DETERMINED_BY_RESOURCE]: CompletionDropdownMap.determinedByResource,
+  [CompletionCriteria.MASTERY]: CompletionDropdownMap.goal,
+  [CompletionCriteria.REFERENCE]: CompletionDropdownMap.reference,
+};
diff --git a/contentcuration/contentcuration/frontend/shared/data/__tests__/applyRemoteChanges.spec.js b/contentcuration/contentcuration/frontend/shared/data/__tests__/applyRemoteChanges.spec.js
index fc9d6d3f6c..b4eb86eda6 100644
--- a/contentcuration/contentcuration/frontend/shared/data/__tests__/applyRemoteChanges.spec.js
+++ b/contentcuration/contentcuration/frontend/shared/data/__tests__/applyRemoteChanges.spec.js
@@ -177,6 +177,19 @@ describe('ChangeDispatcher', () => {
       expect(changeDispatcher.applyPublish).toHaveBeenCalledWith(change);
       expect(result).toBe(applyPublishResult);
     });
+
+    it('should call applyUpdateDescendants if change type is UPDATED_DESCENDANTS and applyUpdateDescendants is defined', async () => {
+      const change = { type: CHANGE_TYPES.UPDATED_DESCENDANTS };
+      const applyUpdateDescendantsResult = 'update descendants result';
+      changeDispatcher.applyUpdateDescendants = jest
+        .fn()
+        .mockResolvedValue(applyUpdateDescendantsResult);
+
+      const result = await changeDispatcher.apply(change);
+
+      expect(changeDispatcher.applyUpdateDescendants).toHaveBeenCalledWith(change);
+      expect(result).toBe(applyUpdateDescendantsResult);
+    });
   });
 });
 
diff --git a/contentcuration/contentcuration/frontend/shared/data/__tests__/changes.spec.js b/contentcuration/contentcuration/frontend/shared/data/__tests__/changes.spec.js
index ca5e2181f9..ea1a795dec 100644
--- a/contentcuration/contentcuration/frontend/shared/data/__tests__/changes.spec.js
+++ b/contentcuration/contentcuration/frontend/shared/data/__tests__/changes.spec.js
@@ -9,6 +9,7 @@ import {
   PublishedChange,
   SyncedChange,
   DeployedChange,
+  UpdatedDescendantsChange,
 } from '../changes';
 import {
   CHANGES_TABLE,
@@ -289,6 +290,26 @@ describe('Change Types', () => {
       ...pick(change, ['type', 'key', 'table', 'source']),
     });
   });
+
+  it('should persist only the specified fields in the UpdatedDescendantsChange', async () => {
+    const changes = { language: 'es' };
+    const change = new UpdatedDescendantsChange({
+      key: '1',
+      table: TABLE_NAMES.CONTENTNODE,
+      oldObj: { title: 'test', language: 'en' },
+      changes,
+      source: CLIENTID,
+    });
+    const rev = await change.saveChange();
+    const persistedChange = await db[CHANGES_TABLE].get(rev);
+
+    expect(persistedChange).toEqual({
+      rev,
+      channel_id,
+      mods: changes,
+      ...pick(change, ['type', 'key', 'table', 'oldObj', 'source']),
+    });
+  });
 });
 
 describe('Change Types Unhappy Paths', () => {
@@ -649,4 +670,24 @@ describe('Change Types Unhappy Paths', () => {
       new ReferenceError('test is not a valid table value')
     );
   });
+
+  // UpdatedDescendantsChange
+  it('should throw error when UpdatedDescendantsChange is instantiated without changes', () => {
+    expect(
+      () =>
+        new UpdatedDescendantsChange({ key: '1', table: TABLE_NAMES.CONTENTNODE, source: CLIENTID })
+    ).toThrow(new TypeError('changes should be an object, but undefined was passed instead'));
+  });
+
+  it('should throw error if UpdatedDescendantsChange is instantiated with a table different than CONTENTNODE', () => {
+    expect(
+      () =>
+        new UpdatedDescendantsChange({
+          key: '1',
+          table: TABLE_NAMES.CHANNEL,
+          changes: {},
+          source: CLIENTID,
+        })
+    ).toThrow();
+  });
 });
diff --git a/contentcuration/contentcuration/frontend/shared/data/__tests__/resources.spec.js b/contentcuration/contentcuration/frontend/shared/data/__tests__/resources.spec.js
new file mode 100644
index 0000000000..34b285e48e
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/shared/data/__tests__/resources.spec.js
@@ -0,0 +1,174 @@
+import { UpdatedDescendantsChange } from '../changes';
+import db from 'shared/data/db';
+import { CHANGE_TYPES, TABLE_NAMES } from 'shared/data/constants';
+import { ContentKindsNames } from 'shared/leUtils/ContentKinds';
+import { ContentNode } from 'shared/data/resources';
+import { mockChannelScope, resetMockChannelScope } from 'shared/utils/testing';
+
+const CLIENTID = 'test-client-id';
+
+const parentId = 'test-parent-id';
+const childId = 'test-child-id';
+const grandchildId = 'test-grandchild-id';
+
+const contentNodes = [
+  {
+    id: parentId,
+    title: 'test-title-1',
+    kind: ContentKindsNames.TOPIC,
+  },
+  {
+    id: childId,
+    title: 'test-title-2',
+    parent: parentId,
+    kind: ContentKindsNames.TOPIC,
+  },
+  {
+    id: grandchildId,
+    title: 'test-title-3',
+    parent: childId,
+    kind: ContentKindsNames.VIDEO,
+  },
+];
+
+describe('Resources', () => {
+  const channel_id = 'test-123';
+  beforeEach(async () => {
+    await db[TABLE_NAMES.CONTENTNODE].clear();
+    await db[TABLE_NAMES.CHANGES_TABLE].clear();
+    await mockChannelScope(channel_id);
+
+    await Promise.all(contentNodes.map(node => db[TABLE_NAMES.CONTENTNODE].add(node)));
+  });
+
+  afterEach(async () => {
+    await resetMockChannelScope();
+  });
+
+  describe('ContentNode resource', () => {
+    describe('Updated descendants changes', () => {
+      const saveChange = async (changes, key = parentId) => {
+        const change = new UpdatedDescendantsChange({
+          key,
+          table: TABLE_NAMES.CONTENTNODE,
+          changes,
+          source: CLIENTID,
+        });
+
+        const rev = await change.saveChange();
+        return rev;
+      };
+
+      it('should get empty array if no data is passed', async () => {
+        await saveChange({ lang: 'en' });
+
+        const inheritedChanges = await ContentNode.getInheritedChanges([]);
+        expect(inheritedChanges).toEqual([]);
+      });
+
+      it('should get empty array if no descendants changes have been made', async () => {
+        const inheritedChanges = await ContentNode.getInheritedChanges([contentNodes[2]]);
+        expect(inheritedChanges).toEqual([]);
+      });
+
+      it('should get empty array if no descendants changes have been made to the correct ascendants', async () => {
+        await saveChange({ lang: 'en' }, 'test-123');
+        const inheritedChanges = await ContentNode.getInheritedChanges([contentNodes[2]]);
+        expect(inheritedChanges).toEqual([]);
+      });
+
+      it('should return the inherited changes for children', async () => {
+        const rev = await saveChange({ lang: 'en' });
+        const inheritedChanges = await ContentNode.getInheritedChanges([contentNodes[1]]);
+        expect(inheritedChanges.length).toEqual(1);
+        expect(inheritedChanges[0].rev).toEqual(rev);
+      });
+
+      it('should return the inherited changes for descendants', async () => {
+        const rev = await saveChange({ lang: 'en' });
+        const inheritedChanges = await ContentNode.getInheritedChanges([contentNodes[2]]);
+        expect(inheritedChanges.length).toEqual(1);
+        expect(inheritedChanges[0].rev).toEqual(rev);
+      });
+
+      it('descendants should inherit changes as "UPDATED" type of change for themsleves', async () => {
+        await saveChange({ lang: 'en' });
+        const [change] = await ContentNode.getInheritedChanges([contentNodes[2]]);
+        expect(change.type).toEqual(CHANGE_TYPES.UPDATED);
+        expect(change.key).toEqual(contentNodes[2].id);
+      });
+
+      it('should return multiple inherited changes', async () => {
+        const revs = await Promise.all([saveChange({ lang: 'en' }), saveChange({ lang: 'es' })]);
+        const inheritedChanges = await ContentNode.getInheritedChanges([contentNodes[1]]);
+        expect(inheritedChanges.length).toEqual(revs.length);
+        expect(inheritedChanges.map(change => change.rev)).toEqual(revs);
+      });
+
+      it('should return the inherited changes for multiple descendants', async () => {
+        const rev = await saveChange({ lang: 'en' });
+        const inheritedChanges = await ContentNode.getInheritedChanges([
+          contentNodes[1],
+          contentNodes[2],
+        ]);
+        expect(inheritedChanges.length).toEqual(2);
+
+        const [first, second] = inheritedChanges;
+        expect(first.rev).toEqual(rev);
+        expect(second.rev).toEqual(rev);
+        expect(first.key).toEqual(contentNodes[1].id);
+        expect(second.key).toEqual(contentNodes[2].id);
+      });
+
+      it('should return the inherited changes from multiple ascendants', async () => {
+        const revs = await Promise.all([
+          saveChange({ lang: 'en' }, parentId),
+          saveChange({ lang: 'es' }, childId),
+        ]);
+        const inheritedChanges = await ContentNode.getInheritedChanges([contentNodes[2]]);
+        expect(inheritedChanges.length).toEqual(revs.length);
+        expect(inheritedChanges.map(change => change.rev)).toEqual(revs);
+      });
+    });
+
+    describe('Update descendants', () => {
+      const changes = { lang: 'en' };
+      it('should update the parent itself', async () => {
+        await ContentNode.updateDescendants(parentId, changes);
+        const node = await db[TABLE_NAMES.CONTENTNODE].get(parentId);
+        expect(node).toEqual(expect.objectContaining(changes));
+      });
+
+      it('should update the children', async () => {
+        await ContentNode.updateDescendants(parentId, changes);
+        const node = await db[TABLE_NAMES.CONTENTNODE].get(childId);
+        expect(node).toEqual(expect.objectContaining(changes));
+      });
+
+      it('should update the descendants', async () => {
+        await ContentNode.updateDescendants(parentId, changes);
+        const node = await db[TABLE_NAMES.CONTENTNODE].get(grandchildId);
+        expect(node).toEqual(expect.objectContaining(changes));
+      });
+
+      it('shouldnt update other nodes', async () => {
+        await ContentNode.updateDescendants('test-123', changes);
+        const node = await db[TABLE_NAMES.CONTENTNODE].get(parentId);
+        expect(node.language).not.toEqual(changes.lang);
+      });
+
+      it('should save a new UPDATED DESCENDANTS change', async () => {
+        await ContentNode.updateDescendants(parentId, changes);
+
+        const change = await db[TABLE_NAMES.CHANGES_TABLE]
+          .where({
+            type: CHANGE_TYPES.UPDATED_DESCENDANTS,
+          })
+          .first();
+        expect(change).toBeDefined();
+        expect(change.key).toEqual(parentId);
+        expect(change.mods).toEqual(changes);
+      });
+    });
+  });
+});
diff --git a/contentcuration/contentcuration/frontend/shared/data/applyRemoteChanges.js b/contentcuration/contentcuration/frontend/shared/data/applyRemoteChanges.js
index 7e81231b98..eaa03cd6c0 100644
--- a/contentcuration/contentcuration/frontend/shared/data/applyRemoteChanges.js
+++ b/contentcuration/contentcuration/frontend/shared/data/applyRemoteChanges.js
@@ -7,7 +7,16 @@ import { INDEXEDDB_RESOURCES } from './registry';
 import { RolesNames } from 'shared/leUtils/Roles';
 import { ContentKindsNames } from 'shared/leUtils/ContentKinds';
 
-const { CREATED, DELETED, UPDATED, MOVED, PUBLISHED, SYNCED, DEPLOYED } = CHANGE_TYPES;
+const {
+  CREATED,
+  DELETED,
+  UPDATED,
+  MOVED,
+  PUBLISHED,
+  SYNCED,
+  DEPLOYED,
+  UPDATED_DESCENDANTS,
+} = CHANGE_TYPES;
 
 export function applyMods(obj, mods) {
   for (const keyPath in mods) {
@@ -32,6 +41,7 @@ export function collectChanges(changes) {
         [PUBLISHED]: [],
         [SYNCED]: [],
         [DEPLOYED]: [],
+        [UPDATED_DESCENDANTS]: [],
       };
     }
     collectedChanges[change.table][change.type].push(change);
@@ -76,6 +86,8 @@ export class ChangeDispatcher {
         result = await this.applyCopy(change);
       } else if (change.type === CHANGE_TYPES.PUBLISHED && this.applyPublish) {
         result = await this.applyPublish(change);
+      } else if (change.type === CHANGE_TYPES.UPDATED_DESCENDANTS && this.applyUpdateDescendants) {
+        result = await this.applyUpdateDescendants(change);
       }
     } catch (e) {
       logging.error(e, {
@@ -200,6 +212,30 @@ class ReturnedChanges extends ChangeDispatcher {
         .modify({ changed: false, published: true });
     });
   }
+
+  /**
+   * @param {UpdatedDescendantsChange} change
+   * @return {Promise<void>}
+   */
+  applyUpdateDescendants(change) {
+    if (change.table !== TABLE_NAMES.CONTENTNODE) {
+      return Promise.resolve();
+    }
+
+    const resource = INDEXEDDB_RESOURCES[TABLE_NAMES.CONTENTNODE];
+    if (!resource || !resource.updateDescendants) {
+      return Promise.resolve();
+    }
+
+    return transaction(change, TABLE_NAMES.CONTENTNODE, async () => {
+      const ids = await resource.getLoadedDescendantsIds(change.key);
+      return db
+        .table(TABLE_NAMES.CONTENTNODE)
+        .where(':id')
+        .anyOf(ids)
+        .modify(obj => applyMods(obj, change.mods));
+    });
+  }
 }
 
 /**
diff --git a/contentcuration/contentcuration/frontend/shared/data/changes.js b/contentcuration/contentcuration/frontend/shared/data/changes.js
index 9c00afa7bd..eca58ee4de 100644
--- a/contentcuration/contentcuration/frontend/shared/data/changes.js
+++ b/contentcuration/contentcuration/frontend/shared/data/changes.js
@@ -21,6 +21,12 @@ import {
   COPYING_STATUS,
   TASK_ID,
 } from 'shared/data/constants';
+import {
+  Categories,
+  ContentLevels,
+  ResourcesNeededTypes,
+  ResourcesNeededOptions,
+} from 'shared/constants';
 import { INDEXEDDB_RESOURCES } from 'shared/data/registry';
 
 /**
@@ -466,3 +472,59 @@ export class DeployedChange extends Change {
     this.setChannelAndUserId({ id: this.key });
   }
 }
+
+/**
+ * Change that represents an update to a content node and its descendants
+ * It can be used just with the content node table.
+ */
+export class UpdatedDescendantsChange extends Change {
+  constructor({ oldObj, changes, ...fields }) {
+    fields.type = CHANGE_TYPES.UPDATED_DESCENDANTS;
+    super(fields);
+    if (this.table !== TABLE_NAMES.CONTENTNODE) {
+      throw TypeError(
+        `${this.changeType} is only supported by ${TABLE_NAMES.CONTENTNODE} table but ${this.table} was passed instead`
+      );
+    }
+    this.validateObj(changes, 'changes');
+    changes = omitIgnoredSubFields(changes);
+    this.mods = changes;
+    this.setModsDeletedProperties();
+    this.setChannelAndUserId(oldObj);
+  }
+
+  get changed() {
+    return !isEmpty(this.mods);
+  }
+
+  /**
+   * To ensure that the mods properties that are multi valued have set
+   * to true just the options that are present in the mods object. All
+   * other options are set to null.
+   */
+  setModsDeletedProperties() {
+    if (!this.mods) return;
+
+    const multiValueProperties = {
+      categories: Object.values(Categories),
+      learner_needs: ResourcesNeededOptions.map(option => ResourcesNeededTypes[option]),
+      grade_levels: Object.values(ContentLevels),
+    };
+    Object.entries(multiValueProperties).forEach(([key, values]) => {
+      if (this.mods[key]) {
+        values.forEach(value => {
+          if (!this.mods[key][value]) {
+            this.mods[key][value] = null;
+          }
+        });
+      }
+    });
+  }
+
+  saveChange() {
+    if (!this.changed) {
+      return Promise.resolve(null);
+    }
+    return super.saveChange();
+  }
+}
diff --git a/contentcuration/contentcuration/frontend/shared/data/constants.js b/contentcuration/contentcuration/frontend/shared/data/constants.js
index 6267f5d308..b6dc4a176b 100644
--- a/contentcuration/contentcuration/frontend/shared/data/constants.js
+++ b/contentcuration/contentcuration/frontend/shared/data/constants.js
@@ -9,6 +9,7 @@ export const CHANGE_TYPES = {
   PUBLISHED: 6,
   SYNCED: 7,
   DEPLOYED: 8,
+  UPDATED_DESCENDANTS: 9,
 };
 /**
  * An array of change types that directly result in the creation of nodes
@@ -28,6 +29,7 @@ export const CHANGE_TYPES_LOOKUP = invert(CHANGE_TYPES);
 
 // Tables
 export const CHANGES_TABLE = 'changesForSyncing';
+export const PAGINATION_TABLE = 'pagination';
 
 export const TABLE_NAMES = {
   SESSION: 'session',
diff --git a/contentcuration/contentcuration/frontend/shared/data/index.js b/contentcuration/contentcuration/frontend/shared/data/index.js
index 1baed3d8d5..99bde2bec4 100644
--- a/contentcuration/contentcuration/frontend/shared/data/index.js
+++ b/contentcuration/contentcuration/frontend/shared/data/index.js
@@ -1,6 +1,6 @@
 import * as Sentry from '@sentry/vue';
 import mapValues from 'lodash/mapValues';
-import { CHANGES_TABLE, TABLE_NAMES } from './constants';
+import { CHANGES_TABLE, PAGINATION_TABLE, TABLE_NAMES } from './constants';
 import db from './db';
 import { INDEXEDDB_RESOURCES } from './registry';
 import { startSyncing, stopSyncing, syncOnChanges } from './serverSync';
@@ -15,13 +15,17 @@ export function setupSchema() {
     console.warn('No resources defined!'); // eslint-disable-line no-console
   }
   // Version incremented to 2 to add Bookmark table and new index on CHANGES_TABLE.
-  db.version(2).stores({
+  // Version incremented to 3 to add:
+  //   new index on CHANGES_TABLE.
+  //   PAGINATION_TABLE.
+  db.version(3).stores({
     // A special table for logging unsynced changes
     // Dexie.js appears to have a table for this,
     // but it seems to squash and remove changes in ways
     // that I do not currently understand, so we engage
     // in somewhat duplicative behaviour instead.
-    [CHANGES_TABLE]: 'rev++,[table+key],server_rev',
+    [CHANGES_TABLE]: 'rev++,[table+key],server_rev,type',
+    [PAGINATION_TABLE]: '[table+queryString]',
     ...mapValues(INDEXEDDB_RESOURCES, value => value.schema),
   });
 }
diff --git a/contentcuration/contentcuration/frontend/shared/data/mergeChanges.js b/contentcuration/contentcuration/frontend/shared/data/mergeChanges.js
index 93a9a90914..3c4129f099 100644
--- a/contentcuration/contentcuration/frontend/shared/data/mergeChanges.js
+++ b/contentcuration/contentcuration/frontend/shared/data/mergeChanges.js
@@ -132,7 +132,7 @@ export default function mergeAllChanges(changes, flatten = false, changesToSync
     if (!('rev' in change) || typeof change.rev === 'undefined') {
       console.error('This change has no `rev`:', change);
       throw new Error('Cannot determine the correct order for a change with no `rev`.');
-    } else if (lastRev && change.rev <= lastRev) {
+    } else if (lastRev && change.rev < lastRev) {
       console.error("These changes aren't ordered by `rev`:", changes);
       throw new Error('Cannot merge changes unless they are ordered by `rev`.');
     }
diff --git a/contentcuration/contentcuration/frontend/shared/data/resources.js b/contentcuration/contentcuration/frontend/shared/data/resources.js
index e55337be5f..854e800c68 100644
--- a/contentcuration/contentcuration/frontend/shared/data/resources.js
+++ b/contentcuration/contentcuration/frontend/shared/data/resources.js
@@ -3,12 +3,11 @@ import Mutex from 'mutex-js';
 import findIndex from 'lodash/findIndex';
 import flatMap from 'lodash/flatMap';
 import isArray from 'lodash/isArray';
-import isNumber from 'lodash/isNumber';
 import isString from 'lodash/isString';
 import matches from 'lodash/matches';
 import overEvery from 'lodash/overEvery';
-import pick from 'lodash/pick';
 import sortBy from 'lodash/sortBy';
+import compact from 'lodash/compact';
 import uniq from 'lodash/uniq';
 import uniqBy from 'lodash/uniqBy';
 
@@ -16,6 +15,7 @@ import { v4 as uuidv4 } from 'uuid';
 import {
   CHANGE_TYPES,
   CHANGES_TABLE,
+  PAGINATION_TABLE,
   RELATIVE_TREE_POSITIONS,
   TABLE_NAMES,
   COPYING_STATUS,
@@ -40,11 +40,13 @@ import {
   PublishedChange,
   SyncedChange,
   DeployedChange,
+  UpdatedDescendantsChange,
 } from './changes';
 import urls from 'shared/urls';
 import { currentLanguage } from 'shared/i18n';
 import client, { paramsSerializer } from 'shared/client';
 import { DELAYED_VALIDATION, fileErrors, NEW_OBJECT } from 'shared/constants';
+import { ContentKindsNames } from 'shared/leUtils/ContentKinds';
 
 // Number of seconds after which data is considered stale.
 const REFRESH_INTERVAL = 5;
@@ -58,6 +60,7 @@ const QUERY_SUFFIXES = {
 };
 
 const ORDER_FIELD = 'ordering';
+const PAGINATION_FIELD = 'max_results';
 
 const VALID_SUFFIXES = new Set(Object.values(QUERY_SUFFIXES));
 
@@ -66,60 +69,6 @@ const validPositions = new Set(Object.values(RELATIVE_TREE_POSITIONS));
 
 const EMPTY_ARRAY = Symbol('EMPTY_ARRAY');
 
-class Paginator {
-  constructor(params) {
-    // Get parameters for page number based pagination
-    Object.assign(this, pick(params, 'page', 'page_size'));
-    // At a minimum, this pagination style requires a page_size
-    // parameter, so we check to see if that exists.
-    if (this.page_size) {
-      this.pageNumberType = true;
-      this.page = this.page || 1;
-    }
-    // Get parameters for limit offset pagination
-    Object.assign(this, pick(params, 'limit', 'offset'));
-    // At a minimum, this pagination style requires a limit
-    // parameter, so we check to see if that exists.
-    if (this.limit) {
-      this.limitOffsetType = true;
-      this.offset = this.offset || 0;
-    }
-    if (this.pageNumberType && this.limitOffsetType) {
-      console.warn(
-        'Specified both page number type pagination and limit offset may get unexpected results'
-      );
-    }
-  }
-  paginate(collection) {
-    let offset;
-    let limit;
-    if (this.pageNumberType) {
-      offset = (this.page - 1) * this.page_size;
-      limit = this.page_size;
-    }
-    if (this.limitOffsetType) {
-      offset = this.offset;
-      limit = this.limit;
-    }
-    if (isNumber(offset) && isNumber(limit)) {
-      const countPromise = collection.count();
-      const resultPromise = collection
-        .offset(offset)
-        .limit(limit)
-        .toArray();
-      return Promise.all([countPromise, resultPromise]).then(([count, results]) => {
-        const out = { count, results };
-        if (this.pageNumberType) {
-          out.total_pages = Math.ceil(count / this.page_size);
-          out.page = this.page;
-        }
-        return out;
-      });
-    }
-    return collection.toArray();
-  }
-}
-
 let vuexStore;
 
 export function injectVuexStore(store) {
@@ -268,6 +217,68 @@ class IndexedDBResource {
     });
   }
 
+  /**
+   * Search the "updated descendants" changes of the current resource and its
+   * parents to find any changes that should be applied to the current resource.
+   * And it transforms these "updated descendants" changes into "updated" changes
+   * to the current resource.
+   * @returns
+   */
+  async getInheritedChanges(itemData = []) {
+    if (this.tableName !== TABLE_NAMES.CONTENTNODE || !itemData.length) {
+      return Promise.resolve([]);
+    }
+
+    const updatedDescendantsChanges = await db[CHANGES_TABLE].where('type')
+      .equals(CHANGE_TYPES.UPDATED_DESCENDANTS)
+      .toArray();
+    if (!updatedDescendantsChanges.length) {
+      return Promise.resolve([]);
+    }
+
+    const inheritedChanges = [];
+    const parentIds = [...new Set(itemData.map(item => item.parent).filter(Boolean))];
+    const ancestorsPromises = parentIds.map(parentId => this.getAncestors(parentId));
+    const parentsAncestors = await Promise.all(ancestorsPromises);
+
+    parentsAncestors.forEach(ancestors => {
+      const parent = ancestors[ancestors.length - 1];
+      const ancestorsIds = ancestors.map(ancestor => ancestor.id);
+      const parentChanges = updatedDescendantsChanges.filter(change =>
+        ancestorsIds.includes(change.key)
+      );
+      if (!parentChanges.length) {
+        return;
+      }
+
+      itemData
+        .filter(item => item.parent === parent.id)
+        .forEach(item => {
+          inheritedChanges.push(
+            ...parentChanges.map(change => ({
+              ...change,
+              key: item.id,
+              type: CHANGE_TYPES.UPDATED,
+            }))
+          );
+        });
+    });
+
+    return inheritedChanges;
+  }
+
+  mergeDescendantsChanges(changes, inheritedChanges) {
+    if (inheritedChanges.length) {
+      changes.push(...inheritedChanges);
+      changes = sortBy(changes, 'rev');
+    }
+    changes
+      .filter(change => change.type === CHANGE_TYPES.UPDATED_DESCENDANTS)
+      .forEach(change => (change.type = CHANGE_TYPES.UPDATED));
+
+    return changes;
+  }
+
   setData(itemData) {
     const now = Date.now();
     // Directly write to the table, rather than using the add/update methods
@@ -277,83 +288,88 @@ class IndexedDBResource {
       const changesPromise = db[CHANGES_TABLE].where('[table+key]')
         .anyOf(itemData.map(datum => [this.tableName, this.getIdValue(datum)]))
         .sortBy('rev');
+      const inheritedChangesPromise = this.getInheritedChanges(itemData);
       const currentPromise = this.table
         .where(this.idField)
         .anyOf(itemData.map(datum => this.getIdValue(datum)))
         .toArray();
 
-      return Promise.all([changesPromise, currentPromise]).then(([changes, currents]) => {
-        changes = mergeAllChanges(changes, true);
-        const collectedChanges = collectChanges(changes)[this.tableName] || {};
-        for (const changeType of Object.keys(collectedChanges)) {
-          const map = {};
-          for (const change of collectedChanges[changeType]) {
-            map[change.key] = change;
-          }
-          collectedChanges[changeType] = map;
-        }
-        const currentMap = {};
-        for (const currentObj of currents) {
-          currentMap[this.getIdValue(currentObj)] = currentObj;
-        }
-        const data = itemData
-          .map(datum => {
-            const id = this.getIdValue(datum);
-            datum[LAST_FETCHED] = now;
-            // Persist TASK_ID and COPYING_STATUS attributes when directly fetching from the server
-            if (currentMap[id] && currentMap[id][TASK_ID]) {
-              datum[TASK_ID] = currentMap[id][TASK_ID];
-            }
-            if (currentMap[id] && currentMap[id][COPYING_STATUS]) {
-              datum[COPYING_STATUS] = currentMap[id][COPYING_STATUS];
-            }
-            // If we have an updated change, apply the modifications here
-            if (
-              collectedChanges[CHANGE_TYPES.UPDATED] &&
-              collectedChanges[CHANGE_TYPES.UPDATED][id]
-            ) {
-              applyMods(datum, collectedChanges[CHANGE_TYPES.UPDATED][id].mods);
+      return Promise.all([changesPromise, inheritedChangesPromise, currentPromise]).then(
+        ([changes, inheritedChanges, currents]) => {
+          changes = this.mergeDescendantsChanges(changes, inheritedChanges);
+          changes = mergeAllChanges(changes, true);
+          const collectedChanges = collectChanges(changes)[this.tableName] || {};
+          for (const changeType of Object.keys(collectedChanges)) {
+            const map = {};
+            for (const change of collectedChanges[changeType]) {
+              map[change.key] = change;
             }
-            return datum;
-            // If we have a deleted change, just filter out this object so we don't reput it
-          })
-          .filter(
-            datum =>
-              !collectedChanges[CHANGE_TYPES.DELETED] ||
-              !collectedChanges[CHANGE_TYPES.DELETED][this.getIdValue(datum)]
-          );
-        return this.table.bulkPut(data).then(() => {
-          // Move changes need to be reapplied on top of fetched data in case anything
-          // has happened on the backend.
-          return applyChanges(Object.values(collectedChanges[CHANGE_TYPES.MOVED] || {})).then(
-            results => {
-              if (!results || !results.length) {
-                return data;
+            collectedChanges[changeType] = map;
+          }
+          const currentMap = {};
+          for (const currentObj of currents) {
+            currentMap[this.getIdValue(currentObj)] = currentObj;
+          }
+          const data = itemData
+            .map(datum => {
+              const id = this.getIdValue(datum);
+              datum[LAST_FETCHED] = now;
+              // Persist TASK_ID and COPYING_STATUS attributes when directly
+              // fetching from the server
+              if (currentMap[id] && currentMap[id][TASK_ID]) {
+                datum[TASK_ID] = currentMap[id][TASK_ID];
               }
-              const resultsMap = {};
-              for (const result of results) {
-                const id = this.getIdValue(result);
-                resultsMap[id] = result;
+              if (currentMap[id] && currentMap[id][COPYING_STATUS]) {
+                datum[COPYING_STATUS] = currentMap[id][COPYING_STATUS];
               }
-              return data
-                .map(datum => {
-                  const id = this.getIdValue(datum);
-                  if (resultsMap[id]) {
-                    applyMods(datum, resultsMap[id]);
-                  }
-                  return datum;
-                  // Concatenate any unsynced created objects onto
-                  // the end of the returned objects
-                })
-                .concat(Object.values(collectedChanges[CHANGE_TYPES.CREATED]).map(c => c.obj));
-            }
-          );
-        });
-      });
+              // If we have an updated change, apply the modifications here
+              if (
+                collectedChanges[CHANGE_TYPES.UPDATED] &&
+                collectedChanges[CHANGE_TYPES.UPDATED][id]
+              ) {
+                applyMods(datum, collectedChanges[CHANGE_TYPES.UPDATED][id].mods);
+              }
+              return datum;
+              // If we have a deleted change, just filter out this object so we don't reput it
+            })
+            .filter(
+              datum =>
+                !collectedChanges[CHANGE_TYPES.DELETED] ||
+                !collectedChanges[CHANGE_TYPES.DELETED][this.getIdValue(datum)]
+            );
+          return this.table.bulkPut(data).then(() => {
+            // Move changes need to be reapplied on top of fetched data in case anything
+            // has happened on the backend.
+            return applyChanges(Object.values(collectedChanges[CHANGE_TYPES.MOVED] || {})).then(
+              results => {
+                if (!results || !results.length) {
+                  return data;
+                }
+                const resultsMap = {};
+                for (const result of results) {
+                  const id = this.getIdValue(result);
+                  resultsMap[id] = result;
+                }
+                return data
+                  .map(datum => {
+                    const id = this.getIdValue(datum);
+                    if (resultsMap[id]) {
+                      applyMods(datum, resultsMap[id]);
+                    }
+                    return datum;
+                    // Concatenate any unsynced created objects onto
+                    // the end of the returned objects
+                  })
+                  .concat(Object.values(collectedChanges[CHANGE_TYPES.CREATED]).map(c => c.obj));
+              }
+            );
+          });
+        }
+      );
     });
   }
 
-  where(params = {}) {
+  async where(params = {}) {
     const table = db[this.tableName];
     // Indexed parameters
     const whereParams = {};
@@ -367,9 +383,17 @@ class IndexedDBResource {
     let sortBy;
     let reverse;
 
-    // Setup paginator.
-    const paginator = new Paginator(params);
+    // Check for pagination
+    const maxResults = Number(params[PAGINATION_FIELD]);
+    const paginationActive = !isNaN(maxResults);
+    if (paginationActive && !params[ORDER_FIELD]) {
+      params[ORDER_FIELD] = this.defaultOrdering;
+    }
     for (const key of Object.keys(params)) {
+      if (key === PAGINATION_FIELD) {
+        // Don't filter by parameters that are used for pagination
+        continue;
+      }
       // Partition our parameters
       const [rootParam, suffix] = key.split(SUFFIX_SEPERATOR);
       if (suffix && VALID_SUFFIXES.has(suffix) && suffix !== QUERY_SUFFIXES.IN) {
@@ -391,8 +415,7 @@ class IndexedDBResource {
         } else {
           sortBy = ordering;
         }
-      } else if (!paginator[key]) {
-        // Don't filter by parameters that are used for pagination
+      } else {
         filterParams[rootParam] = params[key];
       }
     }
@@ -446,8 +469,11 @@ class IndexedDBResource {
         sortBy = null;
       }
     } else {
-      if (sortBy && this.indexFields.has(sortBy) && !reverse) {
+      if (sortBy && this.indexFields.has(sortBy)) {
         collection = table.orderBy(sortBy);
+        if (reverse) {
+          collection = collection.reverse();
+        }
         sortBy = null;
       } else {
         collection = table.toCollection();
@@ -499,13 +525,40 @@ class IndexedDBResource {
     if (filterFn) {
       collection = collection.filter(filterFn);
     }
+    if (paginationActive) {
+      let results;
+      if (sortBy) {
+        // If we still have a sortBy value here, then we have not sorted using orderBy
+        // so we need to sort here.
+        if (reverse) {
+          collection = collection.reverse();
+        }
+        results = (await collection.sortBy(sortBy)).slice(0, maxResults + 1);
+      } else {
+        results = await collection.limit(maxResults + 1).toArray();
+      }
+      const hasMore = results.length > maxResults;
+      return {
+        results: results.slice(0, maxResults),
+        more: hasMore
+          ? {
+              ...params,
+              lft__gt: results[maxResults - 1].lft,
+            }
+          : null,
+      };
+    }
     if (sortBy) {
       if (reverse) {
         collection = collection.reverse();
       }
       collection = collection.sortBy(sortBy);
     }
-    return paginator.paginate(collection);
+    return collection.toArray();
+  }
+
+  whereLiveQuery(params = {}) {
+    return Dexie.liveQuery(() => this.where(params));
   }
 
   get(id) {
@@ -700,6 +753,21 @@ class Resource extends mix(APIResource, IndexedDBResource) {
     this._requests = {};
   }
 
+  savePagination(queryString, more) {
+    if (more) {
+      return this.transaction({ mode: 'rw' }, PAGINATION_TABLE, () => {
+        return db[PAGINATION_TABLE].put({ table: this.tableName, queryString, more });
+      });
+    }
+    return Promise.resolve();
+  }
+
+  loadPagination(queryString) {
+    return db[PAGINATION_TABLE].get([this.tableName, queryString]).then(pagination => {
+      return pagination ? pagination.more : null;
+    });
+  }
+
   fetchCollection(params) {
     const now = Date.now();
     const queryString = paramsSerializer(params);
@@ -715,16 +783,21 @@ class Resource extends mix(APIResource, IndexedDBResource) {
     const promise = client.get(this.collectionUrl(), { params }).then(response => {
       let itemData;
       let pageData;
+      let more;
       if (Array.isArray(response.data)) {
         itemData = response.data;
       } else if (response.data && response.data.results) {
         pageData = response.data;
         itemData = pageData.results;
+        more = pageData.more;
       } else {
         console.error(`Unexpected response from ${this.urlName}`, response);
         itemData = [];
       }
-      return this.setData(itemData).then(data => {
+      const paginationPromise = pageData
+        ? this.savePagination(queryString, more)
+        : Promise.resolve();
+      return Promise.all([this.setData(itemData), paginationPromise]).then(([data]) => {
         // setData also applies any outstanding local change events to the data
         // so we return the data returned from setData to make sure the most up to date
         // representation is returned from the fetch.
@@ -744,6 +817,50 @@ class Resource extends mix(APIResource, IndexedDBResource) {
     return promise;
   }
 
+  conditionalFetch(objs, params, doRefresh) {
+    if (objs === EMPTY_ARRAY) {
+      return [];
+    }
+    // if there are no objects, and it's also not an empty paginated response (objs.results),
+    // or we mean to refresh
+    if ((!objs.length && !objs.results?.length) || doRefresh) {
+      let refresh = Promise.resolve(true);
+      // ContentNode tree operations are the troublemakers causing the logic below
+      if (this.tableName === TABLE_NAMES.CONTENTNODE) {
+        // Only fetch new updates if we don't have pending changes to ContentNode that
+        // affect local tree structure
+        refresh = db[CHANGES_TABLE].where('table')
+          .equals(TABLE_NAMES.CONTENTNODE)
+          .filter(c => {
+            if (!TREE_CHANGE_TYPES.includes(c.type)) {
+              return false;
+            }
+            let parent = c.parent;
+            if (c.type === CHANGE_TYPES.CREATED) {
+              parent = c.obj.parent;
+            }
+            return (
+              params.parent === parent ||
+              params.parent === c.key ||
+              (params.id__in || []).includes(c.key)
+            );
+          })
+          .count()
+          .then(pendingCount => pendingCount === 0);
+      }
+
+      const fetch = refresh.then(shouldFetch => {
+        const emptyResults = isArray(objs) ? [] : { results: [] };
+        return shouldFetch ? this.fetchCollection(params) : emptyResults;
+      });
+      // Be sure to return the fetch promise to relay fetched objects in this condition
+      if (!objs.length && !objs.results?.length) {
+        return fetch;
+      }
+    }
+    return objs;
+  }
+
   /**
    * @param {Object} params
    * @param {Boolean} [doRefresh=true] -- Whether or not to refresh async from server
@@ -757,48 +874,37 @@ class Resource extends mix(APIResource, IndexedDBResource) {
       console.groupEnd();
       /* eslint-enable */
     }
-    return super.where(params).then(objs => {
-      if (objs === EMPTY_ARRAY) {
-        return [];
+    const paginationLoadPromise = params[PAGINATION_FIELD]
+      ? this.loadPagination(paramsSerializer(params))
+      : Promise.resolve(null);
+    return Promise.all([super.where(params), paginationLoadPromise]).then(([objs, more]) => {
+      objs = this.conditionalFetch(objs, params, doRefresh);
+      if (!isArray(objs) && !objs.more && more) {
+        objs.more = more;
       }
-      // if there are no objects, and it's also not an empty paginated response (objs.count),
-      // or we mean to refresh
-      if ((!objs.length && !objs.count) || doRefresh) {
-        let refresh = Promise.resolve(true);
-        // ContentNode tree operations are the troublemakers causing the logic below
-        if (this.tableName === TABLE_NAMES.CONTENTNODE) {
-          // Only fetch new updates if we don't have pending changes to ContentNode that
-          // affect local tree structure
-          refresh = db[CHANGES_TABLE].where('table')
-            .equals(TABLE_NAMES.CONTENTNODE)
-            .filter(c => {
-              if (!TREE_CHANGE_TYPES.includes(c.type)) {
-                return false;
-              }
-              let parent = c.parent;
-              if (c.type === CHANGE_TYPES.CREATED) {
-                parent = c.obj.parent;
-              }
-              return (
-                params.parent === parent ||
-                params.parent === c.key ||
-                (params.id__in || []).includes(c.key)
-              );
-            })
-            .count()
-            .then(pendingCount => pendingCount === 0);
-        }
+      return objs;
+    });
+  }
 
-        const fetch = refresh.then(shouldFetch => {
-          return shouldFetch ? this.fetchCollection(params) : [];
-        });
-        // Be sure to return the fetch promise to relay fetched objects in this condition
-        if (!objs.length && !objs.count) {
-          return fetch;
+  whereLiveQuery(params = {}, doRefresh = true) {
+    if (process.env.NODE_ENV !== 'production' && process.env.NODE_ENV !== 'test') {
+      /* eslint-disable no-console */
+      console.groupCollapsed(`Getting liveQuery for ${this.tableName} table with params: `, params);
+      console.trace();
+      console.groupEnd();
+      /* eslint-enable */
+    }
+    const observable = Dexie.liveQuery(() => super.where(params));
+    let fetched = false;
+    observable.subscribe({
+      next: objs => {
+        if (!fetched) {
+          fetched = true;
+          this.conditionalFetch(objs, params, doRefresh);
         }
-      }
-      return objs;
+      },
     });
+    return observable;
   }
 
   headModel(id) {
@@ -1166,6 +1272,44 @@ export const Channel = new CreateModelResource({
     // For channels, the appropriate channel_id for a change is just the key
     return obj.id;
   },
+  async languageExistsInResources(id) {
+    let langExists = await this.transaction(
+      { mode: 'r' },
+      TABLE_NAMES.CHANNEL,
+      TABLE_NAMES.CONTENTNODE,
+      () => {
+        return Channel.table.get(id).then(async channel => {
+          return (
+            (await ContentNode.table
+              .where({
+                channel_id: id,
+                language: channel.language,
+              })
+              .count()) > 0
+          );
+        });
+      }
+    );
+    if (!langExists) {
+      langExists = await client
+        .get(this.getUrlFunction('language_exists')(id))
+        .then(response => response.data.exists);
+    }
+    return langExists;
+  },
+  async languagesInResources(id) {
+    const localLanguages = await this.transaction({ mode: 'r' }, TABLE_NAMES.CONTENTNODE, () => {
+      return ContentNode.table
+        .where({ channel_id: id })
+        .filter(node => node.language !== null)
+        .toArray()
+        .then(nodes => nodes.map(node => node.language));
+    });
+    const remoteLanguages = await client
+      .get(this.getUrlFunction('languages')(id))
+      .then(response => response.data.languages);
+    return uniq(compact(localLanguages.concat(remoteLanguages)));
+  },
 });
 
 function getChannelFromChannelScope() {
@@ -1201,6 +1345,7 @@ export const ContentNode = new TreeResource({
     '[root_id+parent]',
     '[node_id+channel_id]',
   ],
+  defaultOrdering: 'lft',
 
   addPrerequisite(target_node, prerequisite) {
     if (target_node === prerequisite) {
@@ -1357,7 +1502,12 @@ export const ContentNode = new TreeResource({
         return Promise.all([getNode, this.where({ parent: parent.id }, false)]).then(
           ([node, siblings]) => {
             let lft = 1;
-            siblings = siblings.filter(s => s.id !== id);
+            // if isCreate is true and target === id, it means it is inserting a node after the
+            // same node (duplicating it), so we will need this node among the siblings to get
+            // the right sort order
+            if (!isCreate || target !== id) {
+              siblings = siblings.filter(s => s.id !== id);
+            }
             if (siblings.length) {
               // If we're creating, we don't need to worry about passing the ID
               lft = this.getNewSortOrder(isCreate ? null : id, target, position, siblings);
@@ -1712,6 +1862,63 @@ export const ContentNode = new TreeResource({
       });
     });
   },
+  async _updateDescendantsChange(id, changes) {
+    const oldObj = await this.table.get(id);
+    if (!oldObj) {
+      return Promise.resolve();
+    }
+
+    const change = new UpdatedDescendantsChange({
+      key: id,
+      table: this.tableName,
+      oldObj,
+      changes,
+      source: CLIENTID,
+    });
+    return this._saveAndQueueChange(change);
+  },
+  /**
+   * Load descendants of a content node that are already in IndexedDB.
+   * It also returns the node itself.
+   * @param {string} id
+   * @returns {Promise<string[]>}
+   *
+   */
+  async getLoadedDescendantsIds(id) {
+    const children = await this.table.where({ parent: id }).toArray();
+    if (!children.length) {
+      return [id];
+    }
+    const descendants = await Promise.all(
+      children.map(child => {
+        if (child.kind === ContentKindsNames.TOPIC) {
+          return this.getLoadedDescendantsIds(child.id);
+        }
+        return child.id;
+      })
+    );
+    return [id].concat(flatMap(descendants, d => d));
+  },
+  /**
+   * Update a node and all its descendants that are already loaded in IndexedDB
+   * @param {*} id parent node to update
+   * @param {*} changes actual changes to made
+   * @returns {Promise<any>}
+   */
+  updateDescendants(id, changes) {
+    return this.transaction({ mode: 'rw' }, CHANGES_TABLE, async () => {
+      changes = this._cleanNew(changes);
+
+      // Update node descendants that are already loaded
+      const ids = await this.getLoadedDescendantsIds(id);
+      await this.table
+        .where('id')
+        .anyOf(...ids)
+        .modify(changes);
+
+      return this._updateDescendantsChange(id, changes);
+    });
+  },
 });
 
 export const ChannelSet = new CreateModelResource({
@@ -1727,7 +1934,7 @@ export const Invitation = new Resource({
 
   accept(id) {
     const changes = { accepted: true };
-    return client.patch(window.Urls.invitationDetail(id), changes).then(() => {
+    return client.post(window.Urls.invitationAccept(id), changes).then(() => {
       return this.transaction({ mode: 'rw' }, () => {
         return this.table.update(id, changes);
       });
diff --git a/contentcuration/contentcuration/frontend/shared/data/serverSync.js b/contentcuration/contentcuration/frontend/shared/data/serverSync.js
index 6cffeae584..ead673ce19 100644
--- a/contentcuration/contentcuration/frontend/shared/data/serverSync.js
+++ b/contentcuration/contentcuration/frontend/shared/data/serverSync.js
@@ -43,6 +43,7 @@ const ChangeTypeMapFields = {
     'assessment_items',
   ]),
   [CHANGE_TYPES.DEPLOYED]: commonFields,
+  [CHANGE_TYPES.UPDATED_DESCENDANTS]: commonFields.concat(['mods']),
 };
 
 /**
diff --git a/contentcuration/contentcuration/frontend/shared/translator.js b/contentcuration/contentcuration/frontend/shared/translator.js
index b52eecaf59..98dba032bb 100644
--- a/contentcuration/contentcuration/frontend/shared/translator.js
+++ b/contentcuration/contentcuration/frontend/shared/translator.js
@@ -2,6 +2,7 @@ import { createTranslator } from 'shared/i18n';
 
 const MESSAGES = {
   fieldRequired: 'This field is required',
+  fieldHasError: 'This field has an error',
   titleRequired: 'Title is required',
   licenseRequired: 'License is required',
   copyrightHolderRequired: 'Copyright holder is required',
@@ -24,6 +25,7 @@ const MESSAGES = {
   longActivityLteOneTwenty: 'Value must be equal or less than 120',
   activityDurationTooLongWarning:
     'This value is very high. Please make sure this is how long learners should work on the resource for, in order to complete it.',
+  changesSaved: 'Changes saved',
 };
 
 export default createTranslator('sharedVue', MESSAGES);
diff --git a/contentcuration/contentcuration/frontend/shared/utils/helpers.js b/contentcuration/contentcuration/frontend/shared/utils/helpers.js
index 28b056cc3e..2e60701048 100644
--- a/contentcuration/contentcuration/frontend/shared/utils/helpers.js
+++ b/contentcuration/contentcuration/frontend/shared/utils/helpers.js
@@ -3,7 +3,10 @@ import debounce from 'lodash/debounce';
 import memoize from 'lodash/memoize';
 import merge from 'lodash/merge';
 
+import { Categories, CategoriesLookup } from 'shared/constants';
 import { LicensesList } from 'shared/leUtils/Licenses';
+import { ContentKindsNames } from 'shared/leUtils/ContentKinds';
+import FormatPresetsMap, { FormatPresetsNames } from 'shared/leUtils/FormatPresets';
 
 function safeParseInt(str) {
   const parsed = parseInt(str);
@@ -424,3 +427,151 @@ export function memoizeDebounce(func, wait = 0, options = {}) {
     mem.apply(this, arguments).apply(this, arguments);
   };
 }
+
+/**
+ * Remove falsy properties in contentNode boolean maps.
+ * This is necessary as in many places we rely on Object.keys() to
+ * get the values of a field, but if the value is false, it should not
+ * be considered a valid value.
+ */
+export function cleanBooleanMaps(contentNode) {
+  const booleanMapFields = [
+    'grade_levels',
+    'learner_needs',
+    'accessibility_labels',
+    'learning_activities',
+    'categories',
+  ];
+  booleanMapFields.forEach(field => {
+    if (contentNode[field]) {
+      Object.keys(contentNode[field]).forEach(key => {
+        if (!contentNode[field][key]) {
+          delete contentNode[field][key];
+        }
+      });
+    }
+  });
+}
+
+/**
+ * Copied implementation from Kolibri to have the same categories order.
+ * From: https://github.com/learningequality/kolibri/blob/c372cd05ddd105a7688db9e3698dc21b842ac3e5/kolibri/plugins/learn/assets/src/composables/useSearch.js#L77
+ */
+function getCategoriesTree() {
+  const libraryCategories = {};
+
+  const availablePaths = {};
+
+  (Object.values(Categories) || []).map(key => {
+    const paths = key.split('.');
+    let path = '';
+    for (const path_segment of paths) {
+      path = path === '' ? path_segment : path + '.' + path_segment;
+      availablePaths[path] = true;
+    }
+  });
+  // Create a nested object representing the hierarchy of categories
+  for (const value of Object.values(Categories)
+    // Sort by the length of the key path to deal with
+    // shorter key paths first.
+    .sort((a, b) => a.length - b.length)) {
+    // Split the value into the paths so we can build the object
+    // down the path to create the nested representation
+    const ids = value.split('.');
+    // Start with an empty path
+    let path = '';
+    // Start with the global object
+    let nested = libraryCategories;
+    for (const fragment of ids) {
+      // Add the fragment to create the path we examine
+      path += fragment;
+      // Check to see if this path is one of the paths
+      // that is available on this device
+      if (availablePaths[path]) {
+        // Lookup the human readable key for this path
+        const nestedKey = CategoriesLookup[path];
+        // Check if we have already represented this in the object
+        if (!nested[nestedKey]) {
+          // If not, add an object representing this category
+          nested[nestedKey] = {
+            // The value is the whole path to this point, so the value
+            // of the key.
+            value: path,
+            // Nested is an object that contains any subsidiary categories
+            nested: {},
+          };
+        }
+        // For the next stage of the loop the relevant object to edit is
+        // the nested object under this key.
+        nested = nested[nestedKey].nested;
+        // Add '.' to path so when we next append to the path,
+        // it is properly '.' separated.
+        path += '.';
+      } else {
+        break;
+      }
+    }
+  }
+  return libraryCategories;
+}
+
+export function getSortedCategories() {
+  const categoriesTree = getCategoriesTree();
+  const categoriesSorted = {};
+  const sortCategories = function(categories) {
+    Object.entries(categories).forEach(([name, category]) => {
+      categoriesSorted[category.value] = name;
+      sortCategories(category.nested);
+    });
+  };
+  sortCategories(categoriesTree);
+  return categoriesSorted;
+}
+
+export function isAudioVideoFile(file) {
+  if (!file || !file.file_format) {
+    return false;
+  }
+
+  const videoAllowedFormats = FormatPresetsMap.get(FormatPresetsNames.HIGH_RES_VIDEO)
+    .allowed_formats;
+  const audioAllowedFormats = FormatPresetsMap.get(FormatPresetsNames.AUDIO).allowed_formats;
+  return (
+    videoAllowedFormats.includes(file.file_format) || audioAllowedFormats.includes(file.file_format)
+  );
+}
+
+export function getFileDuration(nodeFiles, kind) {
+  if (
+    !nodeFiles ||
+    !nodeFiles.length ||
+    ![ContentKindsNames.AUDIO, ContentKindsNames.VIDEO].includes(kind)
+  ) {
+    return null;
+  }
+
+  // filter for the correct file types,
+  // to exclude files such as subtitle or cc
+  const audioVideoFiles = nodeFiles.filter(file => isAudioVideoFile(file));
+  // return the last item in the array
+  const file = audioVideoFiles[audioVideoFiles.length - 1];
+  if (!file || !file.duration) {
+    return null;
+  }
+  return file.duration;
+}
+
+export function hasMultipleFieldValues(array, field) {
+  let value;
+  for (const item of array) {
+    if (!item[field]) {
+      continue;
+    }
+    if (value === undefined) {
+      value = item[field];
+    } else if (value !== item[field]) {
+      return true;
+    }
+  }
+  return false;
+}
diff --git a/contentcuration/contentcuration/frontend/shared/utils/validation.js b/contentcuration/contentcuration/frontend/shared/utils/validation.js
index 3c6676ece5..62ba3b1e45 100644
--- a/contentcuration/contentcuration/frontend/shared/utils/validation.js
+++ b/contentcuration/contentcuration/frontend/shared/utils/validation.js
@@ -159,7 +159,7 @@ function _getErrorMsg(error) {
     [ValidationErrors.ACTIVITY_DURATION_TOO_LONG]: translator.$tr('activityDurationTooLongWarning'),
   };
 
-  return messages[error];
+  return messages[error] || error;
 }
 
 // Helpers
@@ -223,7 +223,7 @@ export function getMasteryModelNValidators() {
 export function getShortActivityDurationValidators() {
   return [
     v => v !== '' || ValidationErrors.ACTIVITY_DURATION_REQUIRED,
-    v => v >= 1 || ValidationErrors.ACTIVITY_DURATION_MIN_FOR_SHORT_ACTIVITY,
+    v => v >= 5 || ValidationErrors.ACTIVITY_DURATION_MIN_FOR_SHORT_ACTIVITY,
     v => v <= 30 || ValidationErrors.ACTIVITY_DURATION_MAX_FOR_SHORT_ACTIVITY,
   ];
 }
@@ -231,7 +231,7 @@ export function getShortActivityDurationValidators() {
 export function getLongActivityDurationValidators() {
   return [
     v => v !== '' || ValidationErrors.ACTIVITY_DURATION_REQUIRED,
-    v => v > 30 || ValidationErrors.ACTIVITY_DURATION_MIN_FOR_LONG_ACTIVITY,
+    v => v > 40 || ValidationErrors.ACTIVITY_DURATION_MIN_FOR_LONG_ACTIVITY,
     v => v <= 120 || ValidationErrors.ACTIVITY_DURATION_MAX_FOR_LONG_ACTIVITY,
   ];
 }
@@ -244,6 +244,21 @@ export function getActivityDurationValidators() {
   ];
 }
 
+/**
+ * Get invalid text for a given value using a list of validators.
+ * @param {Array<Function>} validators
+ * @param {*} value Value to validate.
+ * @returns {String}  Translated error message of the first validator that returns an error.
+                      Empty string if value is valid.
+ */
+export function getInvalidText(validators, value) {
+  return (
+    validators
+      .map(validator => translateValidator(validator)(value))
+      .find(validation => validation !== true) || ''
+  );
+}
+
 // Node validation
 // These functions return an array of error codes
 export function getNodeTitleErrors(node) {
diff --git a/contentcuration/contentcuration/frontend/shared/views/AboutLicensesModal.vue b/contentcuration/contentcuration/frontend/shared/views/AboutLicensesModal.vue
new file mode 100644
index 0000000000..2c11725383
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/shared/views/AboutLicensesModal.vue
@@ -0,0 +1,62 @@
+<template>
+
+  <KModal
+    :title="$tr('licenseInfoHeader')"
+    :cancelText="$tr('close')"
+    @cancel="closeModal()"
+  >
+    <div v-for="(license, index) in licences" :key="index" class="mb-4 mt-3">
+      <h2 class="font-weight-bold mb-1 subheading">
+        {{ license.name }}
+      </h2>
+      <p class="body-1 grey--text mb-1">
+        {{ license.description }}
+      </p>
+      <p v-if="license.license_url">
+        <ActionLink
+          :href="getLicenseUrl(license)"
+          target="_blank"
+          :text="$tr('learnMoreButton')"
+        />
+      </p>
+    </div>
+  </KModal>
+
+</template>
+
+<script>
+
+  import { mapMutations } from 'vuex';
+  import { constantsTranslationMixin } from 'shared/mixins';
+  import { LicensesList } from 'shared/leUtils/Licenses';
+
+  export default {
+    name: 'AboutLicensesModal',
+    mixins: [constantsTranslationMixin],
+    computed: {
+      licences() {
+        return LicensesList.filter(license => license.id).map(license => ({
+          ...license,
+          name: this.translateConstant(license.license_name),
+          description: this.translateConstant(license.license_name + '_description'),
+        }));
+      },
+    },
+    methods: {
+      ...mapMutations({
+        closeModal: 'SET_SHOW_ABOUT_LICENSES',
+      }),
+      getLicenseUrl(license) {
+        const isCC = license.license_url.includes('creativecommons.org');
+        const language = window.languageCode || 'en';
+        return isCC ? `${license.license_url}deed.${language}` : license.license_url;
+      },
+    },
+    $trs: {
+      close: 'Close',
+      learnMoreButton: 'Learn More',
+      licenseInfoHeader: 'About licenses',
+    },
+  };
+
+</script>
\ No newline at end of file
diff --git a/contentcuration/contentcuration/frontend/shared/views/Breadcrumbs.vue b/contentcuration/contentcuration/frontend/shared/views/Breadcrumbs.vue
index 16c09d3313..a1fd1959c6 100644
--- a/contentcuration/contentcuration/frontend/shared/views/Breadcrumbs.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/Breadcrumbs.vue
@@ -119,7 +119,7 @@
 
   /* Truncate text if the last item is too long */
   .breadcrumb:last-child {
-    max-width: calc(100% - 76px);
+    max-width: calc(100% - 86px);
   }
 
   /deep/ .v-breadcrumbs__item {
diff --git a/contentcuration/contentcuration/frontend/shared/views/Divider.vue b/contentcuration/contentcuration/frontend/shared/views/Divider.vue
new file mode 100644
index 0000000000..dc0fe1296e
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/shared/views/Divider.vue
@@ -0,0 +1,30 @@
+<template>
+
+  <hr
+    :style="dividerStyle"
+  >
+
+</template>
+
+<script>
+
+  export default {
+    name: 'Divider',
+    props: {
+      margin: {
+        type: String,
+        default: '16px 0',
+      },
+    },
+    computed: {
+      dividerStyle() {
+        return {
+          border: 0,
+          borderBottom: `1px solid ${this.$themeTokens.fineLine}`,
+          margin: this.margin,
+        };
+      },
+    },
+  };
+
+</script>
diff --git a/contentcuration/contentcuration/frontend/shared/views/LicenseDropdown.vue b/contentcuration/contentcuration/frontend/shared/views/LicenseDropdown.vue
index 9004167be9..64b9ac92d8 100644
--- a/contentcuration/contentcuration/frontend/shared/views/LicenseDropdown.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/LicenseDropdown.vue
@@ -6,6 +6,7 @@
         <VSelect
           ref="license"
           v-model="license"
+          box
           :items="licenses"
           :label="$tr('licenseLabel')"
           color="primary"
@@ -16,28 +17,21 @@
           :readonly="readonly"
           :rules="licenseRules"
           :placeholder="placeholder"
-          :menu-props="menuProps"
+          :hide-selected="isMixedLicense"
+          :menu-props="{ ...menuProps, maxHeight: 250 }"
           class="ma-0"
-          box
+          :class="{ 'with-trailing-input-icon': box }"
           :attach="attach"
           @focus="$emit('focus')"
         >
           <template #append-outer>
-            <InfoModal :header="$tr('licenseInfoHeader')" :items="licenses">
-              <template #header="{ item }">
-                {{ translate(item) }}
-              </template>
-              <template #description="{ item }">
-                {{ translateDescription(item) }}
-                <p v-if="item.license_url" class="mt-1">
-                  <ActionLink
-                    :href="getLicenseUrl(item)"
-                    target="_blank"
-                    :text="$tr('learnMoreButton')"
-                  />
-                </p>
-              </template>
-            </InfoModal>
+            <KIconButton
+              class="info-icon"
+              data-test="info-icon"
+              icon="help"
+              :color="$themeTokens.primary"
+              @click="setShowAboutLicenses(true)"
+            />
           </template>
         </VSelect>
       </template>
@@ -65,22 +59,24 @@
 
 <script>
 
-  import InfoModal from './InfoModal.vue';
+  import { mapMutations } from 'vuex';
   import {
     getLicenseValidators,
     getLicenseDescriptionValidators,
     translateValidator,
   } from 'shared/utils/validation';
+  import { nonUniqueValue } from 'shared/constants';
+  import { findLicense } from 'shared/utils/helpers';
   import { LicensesList } from 'shared/leUtils/Licenses';
   import { constantsTranslationMixin } from 'shared/mixins';
-  import { findLicense } from 'shared/utils/helpers';
   import DropdownWrapper from 'shared/views/form/DropdownWrapper';
 
+  const MIXED_VALUE = 'mixed';
+
   export default {
     name: 'LicenseDropdown',
     components: {
       DropdownWrapper,
-      InfoModal,
     },
     filters: {},
     mixins: [constantsTranslationMixin],
@@ -113,10 +109,17 @@
         type: String,
         default: '',
       },
+      box: {
+        type: Boolean,
+        default: false,
+      },
     },
     computed: {
       license: {
         get() {
+          if (this.isMixedLicense) {
+            return MIXED_VALUE;
+          }
           return this.value && findLicense(this.value.license).id;
         },
         set(value) {
@@ -128,6 +131,9 @@
       },
       description: {
         get() {
+          if (this.isMixedDescription) {
+            return this.$tr('mixed');
+          }
           return this.value && this.value.license_description;
         },
         set(value) {
@@ -137,14 +143,32 @@
           });
         },
       },
+      isMixedLicense() {
+        return this.value && this.value.license === nonUniqueValue;
+      },
+      isMixedDescription() {
+        return this.value && this.value.license_description === nonUniqueValue;
+      },
       selectedLicense() {
+        if (this.isMixedLicense) {
+          return null;
+        }
         return this.value && findLicense(this.value.license);
       },
       isCustom() {
         return this.selectedLicense && this.selectedLicense.is_custom;
       },
       licenses() {
-        return LicensesList;
+        if (!this.isMixedLicense) {
+          return LicensesList;
+        }
+        return [
+          ...LicensesList,
+          {
+            id: MIXED_VALUE,
+            license_name: this.$tr('mixed'),
+          },
+        ];
       },
       licenseRules() {
         return this.required ? getLicenseValidators().map(translateValidator) : [];
@@ -156,33 +180,57 @@
       },
     },
     methods: {
+      ...mapMutations({
+        setShowAboutLicenses: 'SET_SHOW_ABOUT_LICENSES',
+      }),
       translate(item) {
+        if (item.id === MIXED_VALUE) {
+          return this.$tr('mixed');
+        }
         return (item.id && item.id !== '' && this.translateConstant(item.license_name)) || '';
       },
-      translateDescription(item) {
-        return (
-          (item.id &&
-            item.id !== '' &&
-            this.translateConstant(item.license_name + '_description')) ||
-          ''
-        );
-      },
-      getLicenseUrl(item) {
-        const isCC = item.license_url.includes('creativecommons.org');
-        const language = window.languageCode || 'en';
-        return isCC ? `${item.license_url}deed.${language}` : item.license_url;
-      },
     },
     $trs: {
+      mixed: 'Mixed',
       licenseLabel: 'License',
       licenseDescriptionLabel: 'License description',
-      learnMoreButton: 'Learn More',
-      licenseInfoHeader: 'About licenses',
     },
   };
 
 </script>
 
-<style lang="less" scoped>
+<style lang="scss" scoped>
+
+  .with-trailing-input-icon {
+    /deep/ .v-input__append-inner {
+      margin-right: 32px;
+    }
+
+    /deep/ .v-input__append-outer {
+      position: absolute;
+      right: 4px;
+      margin-top: 8px !important;
+    }
+
+    /deep/ .v-input__control > .v-input__slot {
+      background: #e9e9e9 !important;
+
+      &::before {
+        border-color: rgba(0, 0, 0, 0.12) !important;
+      }
+    }
+
+    &.v-input--has-state {
+      /deep/ .v-input__control > .v-input__slot::before {
+        border-color: currentcolor !important;
+      }
+    }
+
+    &:hover {
+      /deep/ .v-input__control > .v-input__slot::before {
+        border-color: rgba(0, 0, 0, 0.3) !important;
+      }
+    }
+  }
 
 </style>
diff --git a/contentcuration/contentcuration/frontend/shared/views/contentNodeFields/CategoryOptions.vue b/contentcuration/contentcuration/frontend/shared/views/contentNodeFields/CategoryOptions.vue
new file mode 100644
index 0000000000..032a720873
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/shared/views/contentNodeFields/CategoryOptions.vue
@@ -0,0 +1,320 @@
+<template>
+
+  <div>
+    <DropdownWrapper>
+      <template #default="{ attach, menuProps }">
+        <VAutocomplete
+          :value="autocompleteValues"
+          :items="autocompleteOptions"
+          :searchInput.sync="categoryText"
+          :label="translateMetadataString('category')"
+          box
+          clearable
+          chips
+          deletableChips
+          multiple
+          item-value="value"
+          item-text="text"
+          :menu-props="{
+            ...menuProps,
+            zIndex: 4,
+            height: expanded ? 0 : 'auto',
+            maxHeight: expanded ? 0 : 300,
+          }"
+          :attach="attach"
+          @click:clear="$nextTick(() => removeAll())"
+        >
+          <template #selection="data">
+            <VTooltip bottom lazy>
+              <template #activator="{ on, attrs }">
+                <VChip
+                  v-bind="attrs"
+                  :close="!data.item.undeletable"
+                  v-on="on"
+                  @input="remove(data.item.value)"
+                >
+                  {{ data.item.text }}
+                </VChip>
+              </template>
+              <div>
+                <div>{{ tooltipText(data.item.value) }}</div>
+              </div>
+            </VTooltip>
+          </template>
+
+          <template #no-data>
+            <VListTile v-if="categoryText && categoryText.trim()">
+              <VListTileContent>
+                <VListTileTitle>
+                  {{ $tr('noCategoryFoundText', { text: categoryText.trim() }) }}
+                </VListTileTitle>
+              </VListTileContent>
+            </VListTile>
+          </template>
+
+          <template #item="{ item }">
+            <VListTile
+              :value="isSelected(item.value)"
+              :class="{ parentOption: !item.value.includes('.') }"
+              @mousedown.prevent
+              @click="onChange(item.value)"
+            >
+              <KCheckbox
+                :checked="isSelected(item.value)"
+                :label="item.text"
+                :value="item.value"
+                style="margin-top: 10px"
+                :style="treeItemStyle(item)"
+                :ripple="false"
+              />
+            </VListTile>
+          </template>
+        </VAutocomplete>
+      </template>
+    </DropdownWrapper>
+
+    <div v-if="expanded" class="checkbox-list-wrapper">
+      <KCheckbox
+        v-for="option in filteredCategories"
+        :key="option.value"
+        data-test="option-checkbox"
+        :label="option.text"
+        :style="treeItemStyle(option)"
+        :checked="isSelected(option.value)"
+        :indeterminate="isCheckboxIndeterminate(option.value)"
+        @change="onChange(option.value)"
+      />
+      <p
+        v-if="!filteredCategories.length"
+        :style="{ color: $themeTokens.annotation }"
+      >
+        {{ $tr('noCategoryFoundText') }}
+      </p>
+    </div>
+  </div>
+
+</template>
+
+<script>
+
+  import camelCase from 'lodash/camelCase';
+  import { getSortedCategories } from 'shared/utils/helpers';
+  import DropdownWrapper from 'shared/views/form/DropdownWrapper';
+  import { constantsTranslationMixin, metadataTranslationMixin } from 'shared/mixins';
+
+  const MIXED = 'mixed';
+
+  export default {
+    name: 'CategoryOptions',
+    components: { DropdownWrapper },
+    mixins: [constantsTranslationMixin, metadataTranslationMixin],
+    props: {
+      /**
+       * This prop receives an object with the following structure:
+       * {
+       *  [categoryId]: [nodeId1, nodeId2, ...]
+       * }
+       * Where nodeId is the id of the node that has the category selected
+       */
+      value: {
+        type: Object,
+        required: true,
+      },
+      /**
+       * An array of nodeIds that we are editing. If none, we will asume that we
+       * are editing just one node
+       */
+      nodeIds: {
+        type: Array,
+        default: () => [],
+      },
+      expanded: {
+        type: Boolean,
+        default: false,
+      },
+    },
+    data() {
+      return {
+        categoryText: null,
+      };
+    },
+    computed: {
+      categoriesList() {
+        const categories = getSortedCategories();
+        return Object.entries(categories).map(([id, category]) => ({
+          value: id,
+          text: this.translateMetadataString(camelCase(category)),
+          level: this.findDepth(id),
+        }));
+      },
+      selected: {
+        get() {
+          return this.value;
+        },
+        set(value) {
+          this.$emit('input', value);
+        },
+      },
+      autocompleteOptions() {
+        const options = [...this.categoriesList];
+        if (this.expanded) {
+          // Just boolean maps can have indeterminate values
+          options.push({
+            value: MIXED,
+            text: this.$tr('mixedLabel'),
+            undeletable: true,
+          });
+        }
+        return options;
+      },
+      autocompleteValues() {
+        const selectedValues = Object.entries(this.selected)
+          .filter(entry => entry[1].length === this.nodeIds.length)
+          .map(([key]) => key);
+        if (
+          this.expanded &&
+          Object.values(this.selected).some(value => value.length < this.nodeIds.length)
+        ) {
+          selectedValues.push(MIXED);
+        }
+        return selectedValues;
+      },
+      nested() {
+        return !this.categoryText;
+      },
+      filteredCategories() {
+        const searchQuery = this.categoryText?.trim().toLowerCase();
+        if (!searchQuery) {
+          return this.categoriesList;
+        }
+        return this.categoriesList.filter(option =>
+          option.text.toLowerCase().includes(searchQuery)
+        );
+      },
+    },
+    methods: {
+      treeItemStyle(item) {
+        const rule = this.$isRTL ? 'paddingRight' : 'paddingLeft';
+        return this.nested ? { [rule]: `${item.level * 24}px` } : {};
+      },
+      add(value) {
+        this.selected = {
+          ...this.selected,
+          [value]: this.nodeIds,
+        };
+      },
+      remove(value) {
+        const newSelected = { ...this.selected };
+        Object.keys(this.selected)
+          .filter(selectedValue => selectedValue.startsWith(value))
+          .forEach(selectedValue => {
+            delete newSelected[selectedValue];
+          });
+        this.selected = newSelected;
+      },
+      removeAll() {
+        this.selected = {};
+      },
+      tooltipText(optionId) {
+        if (optionId === MIXED) {
+          return this.$tr('mixedLabel');
+        }
+        const option = this.categoriesList.find(option => option.value === optionId);
+        if (!option) {
+          return '';
+        }
+        let currentOption = optionId;
+        let text = option.text || '';
+        const level = option.level;
+        for (let i = level - 1; i >= 0; i--) {
+          const parentOption = this.categoriesList.find(
+            option => currentOption.startsWith(option.value) && option.level === i
+          );
+          if (parentOption) {
+            text = `${parentOption.text} - ${text}`;
+            currentOption = parentOption.value;
+          }
+        }
+        return text;
+      },
+      findDepth(val) {
+        return val.split('.').length - 1;
+      },
+      isSelected(value) {
+        // If the value is truthy (true or an array of nodeIds) then
+        // it is selected just if it is true (not an array)
+        if (this.selected[value] && this.selected[value].length === this.nodeIds.length) {
+          return true;
+        }
+
+        return this.isCheckboxSelectedByChildren(value);
+      },
+      /**
+       * Returns true if the given option should be selected thanks to its children.
+       * An option will be selected thanks to its children if:
+       * * One of the children is selected
+       * * It has several indeterminate children, but by joining all the contentNodes of the
+       *   child options, together they constitute the same array of selected contentNodes.
+       */
+      isCheckboxSelectedByChildren(optionId) {
+        const childrenOptions = Object.keys(this.selected)
+          .filter(selectedValue => selectedValue.startsWith(optionId))
+          .map(selectedValue => this.selected[selectedValue]);
+
+        if (childrenOptions.length === 0) {
+          return false; // No childen options
+        } else if (childrenOptions.length === 1) {
+          // just one child option, the value is deterrmined by if it is selected
+          return childrenOptions[0].length === this.nodeIds.length;
+        }
+
+        // Here multiple children are selected or indeterminate
+        if (childrenOptions.some(value => value.length === this.nodeIds.length)) {
+          // if some child value is selected for all nodes, then the parent option is selected
+          return true;
+        }
+
+        // Here all children options are mixed, we need to check if together
+        // the parent option is common for all nodes
+        const nodeIds = new Set();
+        childrenOptions.forEach(valueNodeIds => {
+          valueNodeIds.forEach(nodeId => nodeIds.add(nodeId));
+        });
+        return nodeIds.size === this.nodeIds.length;
+      },
+      isCheckboxIndeterminate(optionId) {
+        if (this.selected[optionId] && this.selected[optionId].length < this.nodeIds.length) {
+          return true;
+        }
+        return (
+          Object.keys(this.selected).some(selectedValue => selectedValue.startsWith(optionId)) &&
+          !this.isSelected(optionId)
+        );
+      },
+      onChange(optionId) {
+        if (this.isSelected(optionId)) {
+          this.remove(optionId);
+        } else {
+          this.add(optionId);
+        }
+      },
+    },
+    $trs: {
+      noCategoryFoundText: 'Category not found',
+      mixedLabel: 'Mixed',
+    },
+  };
+
+</script>
+<style lang="less" scoped>
+
+  .parentOption:not(:first-child) {
+    border-top: 1px solid rgba(0, 0, 0, 0.12);
+  }
+
+  .checkbox-list-wrapper {
+    height: 250px;
+    overflow-y: auto;
+  }
+
+</style>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/ActivityDuration.vue b/contentcuration/contentcuration/frontend/shared/views/contentNodeFields/CompletionOptions/ActivityDuration.vue
similarity index 66%
rename from contentcuration/contentcuration/frontend/channelEdit/components/edit/ActivityDuration.vue
rename to contentcuration/contentcuration/frontend/shared/views/contentNodeFields/CompletionOptions/ActivityDuration.vue
index 2afa529798..a3606057b5 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/ActivityDuration.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/contentNodeFields/CompletionOptions/ActivityDuration.vue
@@ -1,15 +1,15 @@
 <template>
 
   <VFlex>
-    <VLayout row wrap justify-space-between>
+    <VLayout row wrap>
       <VFlex
-        v-if="audioVideoUpload && selectedDuration === 'exactTime'"
+        v-if="audioVideoUpload && isExactTime"
         class="defaultUpload md2 sm3"
       >
         {{ convertToHHMMSS(duration || `00:00`) }}
       </VFlex>
       <VFlex
-        v-else-if="selectedDuration === 'shortActivity' || selectedDuration === 'longActivity'"
+        v-else-if="isShortActivity || isLongActivity"
         md3
         sm3
       >
@@ -39,6 +39,20 @@
           :rules="minutesRules"
         />
       </VFlex>
+      <div
+        v-if="showSlider"
+        class="slider-wrapper"
+      >
+        <input
+          v-if="isShortActivity || isLongActivity"
+          v-model="minutes"
+          :class="$computedClass(sliderStyle)"
+          type="range"
+          :min="minRange"
+          :max="maxRange"
+          :step="increments"
+        >
+      </div>
     </VLayout>
     <VLayout row wrap>
       <VFlex v-if="showRequiredLabel">
@@ -54,20 +68,15 @@
 
 <script>
 
-  import debounce from 'lodash/debounce';
   import { CompletionDropdownMap, DurationDropdownMap } from 'shared/constants';
   import {
-    getShortActivityDurationValidators,
-    getLongActivityDurationValidators,
-    getActivityDurationValidators,
     translateValidator,
+    getActivityDurationValidators,
+    getLongActivityDurationValidators,
+    getShortActivityDurationValidators,
   } from 'shared/utils/validation';
   import DropdownWrapper from 'shared/views/form/DropdownWrapper';
 
-  const SHORT_MIN = 1;
-  const SHORT_MAX = 30;
-  const LONG_MIN = 31;
-  const LONG_MAX = 120;
   const EXACT_MIN = 1;
   const EXACT_MAX = 1200;
   const SHORT_ACTIVITY_RANGE = [5, 10, 15, 20, 25, 30];
@@ -97,8 +106,21 @@
         type: Number,
         default: null,
       },
+      showSlider: {
+        type: Boolean,
+        default: false,
+      },
     },
     computed: {
+      isShortActivity() {
+        return this.selectedDuration === DurationDropdownMap.SHORT_ACTIVITY;
+      },
+      isLongActivity() {
+        return this.selectedDuration === DurationDropdownMap.LONG_ACTIVITY;
+      },
+      isExactTime() {
+        return this.selectedDuration === DurationDropdownMap.EXACT_TIME;
+      },
       showRequiredLabel() {
         if (this.audioVideoUpload) {
           return false;
@@ -106,17 +128,14 @@
         return this.selectedCompletion === CompletionDropdownMap.completeDuration;
       },
       showOptionalLabel() {
-        return this.selectedDuration !== DurationDropdownMap.EXACT_TIME;
+        return !this.isExactTime;
       },
       increments() {
-        return this.selectedDuration === DurationDropdownMap.SHORT_ACTIVITY ? 5 : 10;
+        return this.isShortActivity ? 5 : 10;
       },
       availableNumbers() {
-        return this.selectedDuration === DurationDropdownMap.SHORT_ACTIVITY
-          ? SHORT_ACTIVITY_RANGE
-          : LONG_ACTIVITY_RANGE;
+        return this.isShortActivity ? SHORT_ACTIVITY_RANGE : LONG_ACTIVITY_RANGE;
       },
-
       minutes: {
         get() {
           if (!this.value) {
@@ -125,43 +144,49 @@
           return this.convertToMinutes(this.value);
         },
         set(value) {
-          this.handleUpdatedInput(value);
+          this.handleInput(value);
         },
       },
       maxRange() {
-        if (this.selectedDuration === DurationDropdownMap.SHORT_ACTIVITY) {
-          return SHORT_MAX;
-        } else if (this.selectedDuration === 'longActivity') {
-          return LONG_MAX;
+        if (this.isShortActivity) {
+          return SHORT_ACTIVITY_RANGE[SHORT_ACTIVITY_RANGE.length - 1];
+        } else if (this.isLongActivity) {
+          return LONG_ACTIVITY_RANGE[LONG_ACTIVITY_RANGE.length - 1];
         } else {
           return EXACT_MAX;
         }
       },
       minRange() {
-        if (this.selectedDuration === 'shortActvity') {
-          return SHORT_MIN;
-        } else if (this.selectedDuration === DurationDropdownMap.LONG_ACTIVITY) {
-          return LONG_MIN;
+        if (this.isShortActivity) {
+          return SHORT_ACTIVITY_RANGE[0];
+        } else if (this.isLongActivity) {
+          return LONG_ACTIVITY_RANGE[0];
         } else {
           return EXACT_MIN;
         }
       },
       minutesRules() {
-        if (this.selectedDuration === DurationDropdownMap.SHORT_ACTIVITY) {
+        if (this.isShortActivity) {
           return getShortActivityDurationValidators().map(translateValidator);
-        } else if (this.selectedDuration === DurationDropdownMap.LONG_ACTIVITY) {
+        } else if (this.isLongActivity) {
           return getLongActivityDurationValidators().map(translateValidator);
         } else if (
-          this.selectedDuration === DurationDropdownMap.EXACT_TIME &&
+          this.isExactTime &&
           this.selectedCompletion === CompletionDropdownMap.completeDuration
         ) {
           return getActivityDurationValidators().map(translateValidator);
         }
         return [];
       },
-    },
-    created() {
-      this.handleUpdatedInput = debounce(this.handleInput, 500);
+      sliderStyle() {
+        const percent = ((this.minutes - this.minRange) / (this.maxRange - this.minRange)) * 100;
+        return {
+          background: `linear-gradient(to right, ${this.$themeTokens.primary} 0%, ${this.$themeTokens.primary} ${percent}%, ${this.$themeTokens.fineLine} ${percent}%, ${this.$themeTokens.fineLine} 100%)`,
+          '::-webkit-slider-thumb': {
+            background: this.$themeTokens.primary,
+          },
+        };
+      },
     },
     methods: {
       convertToMinutes(seconds) {
@@ -205,4 +230,26 @@
     font-size: 1.2em;
   }
 
+  .slider-wrapper {
+    flex: 1;
+    width: 100%;
+    margin: 20px 16px 0;
+  }
+
+  input[type='range'] {
+    width: 100%;
+    max-width: 300px;
+    height: 2px;
+    outline: none;
+    appearance: none;
+  }
+
+  input[type='range']::-webkit-slider-thumb {
+    width: 12px;
+    height: 12px;
+    appearance: none;
+    cursor: pointer;
+    border-radius: 50%;
+  }
+
 </style>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/MasteryCriteriaGoal.vue b/contentcuration/contentcuration/frontend/shared/views/contentNodeFields/CompletionOptions/MasteryCriteriaGoal.vue
similarity index 82%
rename from contentcuration/contentcuration/frontend/channelEdit/components/edit/MasteryCriteriaGoal.vue
rename to contentcuration/contentcuration/frontend/shared/views/contentNodeFields/CompletionOptions/MasteryCriteriaGoal.vue
index 3b977ecb5f..ab9d0b06e9 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/MasteryCriteriaGoal.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/contentNodeFields/CompletionOptions/MasteryCriteriaGoal.vue
@@ -16,7 +16,7 @@
             :readonly="readonly"
             :disabled="disabled"
             :rules="masteryRules"
-            :menu-props="{ ...menuProps, lazy: false }"
+            :menu-props="{ ...menuProps, lazy: false, maxHeight: maxMenuHeight }"
             :attach="attach"
             class="mb-2"
             @focus="$emit('focus')"
@@ -30,7 +30,11 @@
 
 <script>
 
-  import { getMasteryModelValidators, translateValidator } from 'shared/utils/validation';
+  import {
+    getMasteryModelValidators,
+    translateValidator,
+    getInvalidText,
+  } from 'shared/utils/validation';
   import MasteryModels, { MasteryModelsList } from 'shared/leUtils/MasteryModels';
   import { constantsTranslationMixin } from 'shared/mixins';
   import DropdownWrapper from 'shared/views/form/DropdownWrapper';
@@ -64,6 +68,10 @@
         type: Boolean,
         default: false,
       },
+      maxMenuHeight: {
+        type: Number,
+        default: 300,
+      },
     },
     computed: {
       masteryModel: {
@@ -84,6 +92,19 @@
         return this.required ? getMasteryModelValidators().map(translateValidator) : [];
       },
     },
+    methods: {
+      /**
+       * @public
+       */
+      validate() {
+        if (this.masteryRules.length) {
+          if (this.$refs.masteryModel) {
+            this.$refs.masteryModel.validate(true);
+          }
+          return getInvalidText(this.masteryRules, this.masteryModel);
+        }
+      },
+    },
     $trs: {
       labelText: 'Goal',
     },
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/MasteryCriteriaMofNFields.vue b/contentcuration/contentcuration/frontend/shared/views/contentNodeFields/CompletionOptions/MasteryCriteriaMofNFields.vue
similarity index 90%
rename from contentcuration/contentcuration/frontend/channelEdit/components/edit/MasteryCriteriaMofNFields.vue
rename to contentcuration/contentcuration/frontend/shared/views/contentNodeFields/CompletionOptions/MasteryCriteriaMofNFields.vue
index bfbc0b08eb..6b9755902e 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/MasteryCriteriaMofNFields.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/contentNodeFields/CompletionOptions/MasteryCriteriaMofNFields.vue
@@ -52,6 +52,7 @@
     getMasteryModelMValidators,
     getMasteryModelNValidators,
     translateValidator,
+    getInvalidText,
   } from 'shared/utils/validation';
   import MasteryModels from 'shared/leUtils/MasteryModels';
   import { constantsTranslationMixin } from 'shared/mixins';
@@ -164,6 +165,23 @@
           return false;
         }
       },
+      /**
+       * @public
+       */
+      validate() {
+        let error;
+        if (this.$refs.mValue || this.$refs.nValue) {
+          this.$refs.mValue.validate(true);
+          this.$refs.nValue.validate(true);
+        }
+        if (this.mRules && this.mRules.length) {
+          error = getInvalidText(this.mRules, this.mValue);
+        }
+        if (this.nRules && this.nRules.length) {
+          error = error || getInvalidText(this.nRules, this.nValue);
+        }
+        return error;
+      },
     },
     $trs: {
       mHint: 'Correct answers needed',
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/CompletionOptions.vue b/contentcuration/contentcuration/frontend/shared/views/contentNodeFields/CompletionOptions/index.vue
similarity index 83%
rename from contentcuration/contentcuration/frontend/channelEdit/components/edit/CompletionOptions.vue
rename to contentcuration/contentcuration/frontend/shared/views/contentNodeFields/CompletionOptions/index.vue
index f3efe0871f..d28070b10f 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/CompletionOptions.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/contentNodeFields/CompletionOptions/index.vue
@@ -2,39 +2,38 @@
 
   <div>
     <!-- Checkbox for "Allow learners to mark complete" -->
-    <Checkbox
-      v-model="learnerManaged"
-      color="primary"
-      :indeterminate="notUnique"
+    <KCheckbox
+      :checked="learnerManaged"
       :disabled="notUnique"
+      :indeterminate="notUnique"
       :label="$tr('learnersCanMarkComplete')"
       style="padding-bottom: 16px; font-size: 16px;"
+      @change="(value) => (learnerManaged = value)"
     />
+    <Divider v-if="expanded" />
     <!-- Layout when practice quizzes are enabled -->
-    <VLayout xs6 md6>
+    <VLayout
+      :column="expanded"
+    >
       <!-- "Completion" dropdown menu  -->
-      <DropdownWrapper component="VFlex" xs6 md6 class="pr-2">
-        <template #default="{ attach, menuProps }">
-          <VSelect
-            ref="completion"
-            v-model="completionDropdown"
-            box
-            :placeholder="getPlaceholder('value')"
-            :items="showCorrectCompletionOptions"
-            :label="translateMetadataString('completion')"
-            :required="required"
-            :rules="completionRules"
-            :menu-props="menuProps"
-            :attach="attach"
-            @focus="trackClick('Completion')"
-          />
-        </template>
-      </DropdownWrapper>
-      <VFlex>
+      <ExpandableSelect
+        ref="completion"
+        v-model="completionDropdown"
+        :expanded="expanded"
+        :options="showCorrectCompletionOptions"
+        :placeholder="getPlaceholder('value')"
+        :label="translateMetadataString('completion')"
+        :required="required"
+        :rules="completionRules"
+        :class="expanded ? '' : 'pr-2 xs6 md6'"
+        @focus="trackClick('Completion')"
+      />
+
+      <VFlex v-if="showMasteryCriteriaGoalDropdown">
         <MasteryCriteriaGoal
-          v-if="showMasteryCriteriaGoalDropdown"
           ref="mastery_model"
           v-model="masteryModel"
+          :maxMenuHeight="maxMenuHeight"
           :placeholder="getPlaceholder('mastery_model')"
           :required="isUnique(masteryModel)"
           @focus="trackClick('Mastery model')"
@@ -49,38 +48,39 @@
         v-model="mOfN"
         :showMofN="showMofN"
         :mPlaceholder="getPlaceholder('mOfN.m')"
-        :mRequired="isUnique(mOfN.m)"
+        :mRequired="showMofN && isUnique(mOfN.m)"
         :nPlaceholder="getPlaceholder('mOfN.n')"
-        :nRequired="isUnique(mOfN.n)"
+        :nRequired="showMofN && isUnique(mOfN.n)"
         @mFocus="trackClick('Mastery m value')"
         @nFocus="trackClick('Mastery n value')"
       />
     </VLayout>
 
     <VLayout row wrap>
-      <DropdownWrapper v-if="showDuration" component="VFlex" xs6 md6 class="pr-2">
-        <template #default="{ attach, menuProps }">
-          <VSelect
-            ref="duration"
-            v-model="durationDropdown"
-            box
-            :placeholder="getPlaceholder('value')"
-            :items="selectableDurationOptions"
-            :label="translateMetadataString('duration')"
-            :required="required"
-            :rules="durationRules"
-            :menu-props="{ ...menuProps, zIndex: 4 }"
-            :attach="attach"
-            @focus="trackClick('Duration')"
-          />
-        </template>
-      </DropdownWrapper>
+      <!-- "Duration" dropdown menu  -->
+      <ExpandableSelect
+        v-if="showDuration || showDisabledDuration"
+        ref="duration"
+        v-model="durationDropdown"
+        :disabled="showDisabledDuration"
+        :expanded="expanded"
+        :options="selectableDurationOptions"
+        :label="translateMetadataString('duration')"
+        :required="required"
+        :rules="durationRules"
+        :class="expanded ? '' : 'pr-2 xs6 md6'"
+        @focus="trackClick('Duration')"
+      />
 
       <!-- "Activity duration" minutes input -->
-      <VFlex v-if="showDuration" xs6 md6>
+      <VFlex
+        v-if="showDuration"
+        :class="expanded ? '' : 'xs6 md6'"
+      >
         <ActivityDuration
           ref="activity_duration"
           v-model="durationValue"
+          :showSlider="expanded"
           :selectedDuration="durationDropdown"
           :duration="fileDuration"
           :selectedCompletion="completionDropdown"
@@ -89,8 +89,13 @@
       </VFlex>
 
       <!-- Reference hint -->
-      <VFlex v-if="showReferenceHint" style="margin-bottom: 8px" xs6 md6>
-        {{ $tr('referenceHint') }}
+      <VFlex
+        v-if="showReferenceHint"
+        style="margin-bottom: 8px"
+        :xs6="!expanded"
+        :md6="!expanded"
+      >
+        {{ $tr("referenceHint") }}
       </VFlex>
     </VLayout>
   </div>
@@ -100,24 +105,21 @@
 <script>
 
   import get from 'lodash/get';
-  import {
-    defaultCompletionCriteriaModels,
-    defaultCompletionCriteriaThresholds,
-    CompletionOptionsDropdownMap,
-    completionCriteriaToDropdownMap,
-  } from '../../utils';
-  import MasteryCriteriaMofNFields from './MasteryCriteriaMofNFields';
-  import ActivityDuration from './ActivityDuration.vue';
+  import ActivityDuration from './ActivityDuration';
   import MasteryCriteriaGoal from './MasteryCriteriaGoal';
+  import MasteryCriteriaMofNFields from './MasteryCriteriaMofNFields';
   import {
-    CompletionCriteriaModels,
+    nonUniqueValue,
     ContentModalities,
-    CompletionDropdownMap,
     DurationDropdownMap,
-    nonUniqueValue,
+    CompletionDropdownMap,
+    CompletionCriteriaModels,
+    CompletionOptionsDropdownMap,
     SHORT_LONG_ACTIVITY_MIDPOINT,
+    completionCriteriaToDropdownMap,
+    defaultCompletionCriteriaModels,
+    defaultCompletionCriteriaThresholds,
   } from 'shared/constants';
-  import Checkbox from 'shared/views/form/Checkbox';
   import { MasteryModelsNames } from 'shared/leUtils/MasteryModels';
   import { ContentKindsNames } from 'shared/leUtils/ContentKinds';
   import {
@@ -126,7 +128,7 @@
     translateValidator,
   } from 'shared/utils/validation';
   import { metadataStrings, metadataTranslationMixin } from 'shared/mixins';
-  import DropdownWrapper from 'shared/views/form/DropdownWrapper';
+  import ExpandableSelect from 'shared/views/form/ExpandableSelect';
 
   const DEFAULT_SHORT_ACTIVITY = 600;
   const DEFAULT_LONG_ACTIVITY = 3000;
@@ -134,9 +136,8 @@
   export default {
     name: 'CompletionOptions',
     components: {
-      Checkbox,
-      DropdownWrapper,
       ActivityDuration,
+      ExpandableSelect,
       MasteryCriteriaMofNFields,
       MasteryCriteriaGoal,
     },
@@ -160,6 +161,15 @@
         required: false,
         default: () => ({}),
       },
+      expanded: {
+        type: Boolean,
+        default: false,
+      },
+      maxMenuHeight: {
+        type: Number,
+        required: false,
+        default: 300,
+      },
     },
     computed: {
       notUnique() {
@@ -190,10 +200,13 @@
           this.model === CompletionCriteriaModels.APPROX_TIME
         );
       },
+      showDisabledDuration() {
+        return !this.showDuration && this.expanded && this.audioVideoResource;
+      },
       showReferenceHint() {
         /*
-          The reference hint should be shown only when "Reference" is selected
-        */
+            The reference hint should be shown only when "Reference" is selected
+          */
         return this.model === CompletionCriteriaModels.REFERENCE;
       },
       completionDropdown: {
@@ -330,7 +343,7 @@
           ) {
             update.durationType = CompletionCriteriaModels.APPROX_TIME;
             update.duration = this.handleMinutesInputFromActivityDuration(
-              this.durationValue,
+              this.durationValue || 0,
               dropdownValue
             );
           } else {
@@ -465,6 +478,27 @@
       getPlaceholder(field) {
         return this.isUnique(get(this, field)) ? '' : '---';
       },
+
+      /**
+       * @public
+       */
+      validate() {
+        const fieldsRefs = [
+          'completion',
+          'activity_duration',
+          'mastery_model',
+          'mastery_model_m_of_n',
+        ];
+        for (const ref of fieldsRefs) {
+          const field = this.$refs[ref];
+          if (field && field.validate) {
+            const error = field.validate();
+            if (error) {
+              return error;
+            }
+          }
+        }
+      },
     },
     $trs: {
       referenceHint:
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/LearningActivityOptions.vue b/contentcuration/contentcuration/frontend/shared/views/contentNodeFields/LearningActivityOptions.vue
similarity index 57%
rename from contentcuration/contentcuration/frontend/channelEdit/components/edit/LearningActivityOptions.vue
rename to contentcuration/contentcuration/frontend/shared/views/contentNodeFields/LearningActivityOptions.vue
index 3ffd37968c..ce1f49b8b8 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/LearningActivityOptions.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/contentNodeFields/LearningActivityOptions.vue
@@ -1,23 +1,16 @@
 <template>
 
-  <DropdownWrapper>
-    <template #default="{ attach, menuProps }">
-      <VSelect
-        v-model="learningActivity"
-        :items="learningActivities"
-        :disabled="disabled"
-        box
-        chips
-        clearable
-        :label="translateMetadataString('learningActivity')"
-        multiple
-        deletableChips
-        :menu-props="menuProps"
-        :rules="learningActivityRules"
-        :attach="attach"
-      />
-    </template>
-  </DropdownWrapper>
+  <ExpandableSelect
+    v-model="learningActivity"
+    multiple
+    :disabled="disabled"
+    :expanded="expanded"
+    :options="learningActivities"
+    :hideLabel="hideLabel"
+    :rules="learningActivityRules"
+    :label="translateMetadataString('learningActivity')"
+    :availableItems="nodeIds"
+  />
 
 </template>
 
@@ -25,23 +18,42 @@
 
   import camelCase from 'lodash/camelCase';
   import { LearningActivities } from 'shared/constants';
+  import ExpandableSelect from 'shared/views/form/ExpandableSelect';
   import { constantsTranslationMixin, metadataTranslationMixin } from 'shared/mixins';
   import { getLearningActivityValidators, translateValidator } from 'shared/utils/validation';
-  import DropdownWrapper from 'shared/views/form/DropdownWrapper';
 
   export default {
     name: 'LearningActivityOptions',
-    components: { DropdownWrapper },
+    components: { ExpandableSelect },
     mixins: [constantsTranslationMixin, metadataTranslationMixin],
     props: {
+      /**
+       * This prop receives an object with the following structure:
+       * {
+       *  [learningActivityId]: [nodeId1, nodeId2, ...]
+       * }
+       * Where nodeId is the id of the node that has the learning activity selected
+       */
       value: {
-        type: Array,
-        default: () => [],
+        type: Object,
+        required: true,
       },
       disabled: {
         type: Boolean,
         default: false,
       },
+      expanded: {
+        type: Boolean,
+        default: false,
+      },
+      hideLabel: {
+        type: Boolean,
+        default: false,
+      },
+      nodeIds: {
+        type: Array,
+        required: true,
+      },
     },
     computed: {
       learningActivity: {
@@ -49,7 +61,7 @@
           if (!this.disabled) {
             return this.value;
           }
-          return null;
+          return {};
         },
         set(value) {
           if (!this.disabled) {
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/LevelsOptions.vue b/contentcuration/contentcuration/frontend/shared/views/contentNodeFields/LevelsOptions.vue
similarity index 65%
rename from contentcuration/contentcuration/frontend/channelEdit/components/edit/LevelsOptions.vue
rename to contentcuration/contentcuration/frontend/shared/views/contentNodeFields/LevelsOptions.vue
index 9dea958af7..e300b281a0 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/LevelsOptions.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/contentNodeFields/LevelsOptions.vue
@@ -1,22 +1,14 @@
 <template>
 
-  <DropdownWrapper>
-    <template #default="{ attach, menuProps }">
-      <VSelect
-        ref="level"
-        v-model="level"
-        :items="levels"
-        box
-        chips
-        clearable
-        :label="translateMetadataString('level')"
-        multiple
-        deletableChips
-        :menu-props="menuProps"
-        :attach="attach"
-      />
-    </template>
-  </DropdownWrapper>
+  <ExpandableSelect
+    v-model="level"
+    multiple
+    :expanded="expanded"
+    :options="levels"
+    :hideLabel="hideLabel"
+    :label="translateMetadataString('level')"
+    :availableItems="nodeIds"
+  />
 
 </template>
 
@@ -24,17 +16,36 @@
 
   import camelCase from 'lodash/camelCase';
   import { ContentLevels } from 'shared/constants';
+  import ExpandableSelect from 'shared/views/form/ExpandableSelect';
   import { constantsTranslationMixin, metadataTranslationMixin } from 'shared/mixins';
-  import DropdownWrapper from 'shared/views/form/DropdownWrapper';
 
   export default {
     name: 'LevelsOptions',
-    components: { DropdownWrapper },
+    components: { ExpandableSelect },
     mixins: [constantsTranslationMixin, metadataTranslationMixin],
     props: {
+      /**
+       * This prop receives an object with the following structure:
+       * {
+       *  [levelId]: [nodeId1, nodeId2, ...]
+       * }
+       * Where nodeId is the id of the node that has the level selected
+       */
       value: {
+        type: Object,
+        required: true,
+      },
+      expanded: {
+        type: Boolean,
+        default: false,
+      },
+      hideLabel: {
+        type: Boolean,
+        default: false,
+      },
+      nodeIds: {
         type: Array,
-        default: () => [],
+        required: true,
       },
     },
     computed: {
diff --git a/contentcuration/contentcuration/frontend/shared/views/contentNodeFields/ResourcesNeededOptions.vue b/contentcuration/contentcuration/frontend/shared/views/contentNodeFields/ResourcesNeededOptions.vue
new file mode 100644
index 0000000000..8585ed7911
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/shared/views/contentNodeFields/ResourcesNeededOptions.vue
@@ -0,0 +1,86 @@
+<template>
+
+  <ExpandableSelect
+    v-model="need"
+    multiple
+    :expanded="expanded"
+    :options="resources"
+    :hideLabel="hideLabel"
+    :label="$tr('resourcesNeededLabel')"
+    :hint="hint"
+    :availableItems="nodeIds"
+  />
+
+</template>
+
+<script>
+
+  import ExpandableSelect from 'shared/views/form/ExpandableSelect';
+  import { ResourcesNeededTypes, ResourcesNeededOptions } from 'shared/constants';
+  import { constantsTranslationMixin, metadataTranslationMixin } from 'shared/mixins';
+
+  export default {
+    name: 'ResourcesNeededOptions',
+    components: { ExpandableSelect },
+    mixins: [constantsTranslationMixin, metadataTranslationMixin],
+    props: {
+      /**
+       * This prop receives an object with the following structure:
+       * {
+       *  [resourceId]: [nodeId1, nodeId2, ...]
+       * }
+       * Where nodeId is the id of the node that has the resource selected
+       */
+      value: {
+        type: Object,
+        required: true,
+      },
+      expanded: {
+        type: Boolean,
+        default: false,
+      },
+      hideLabel: {
+        type: Boolean,
+        default: false,
+      },
+      nodeIds: {
+        type: Array,
+        required: true,
+      },
+    },
+    computed: {
+      need: {
+        get() {
+          return this.value;
+        },
+        set(value) {
+          this.$emit('input', value);
+        },
+      },
+      resources() {
+        return ResourcesNeededOptions.map(key => ({
+          text: this.translateMetadataString(key),
+          value: ResourcesNeededTypes[key],
+        }));
+      },
+      hint() {
+        if (Array.isArray(this.value) && this.value.includes(ResourcesNeededTypes.OTHER_SUPPLIES)) {
+          return this.$tr('furtherExplanation');
+        }
+        if (this.value && this.value[ResourcesNeededTypes.OTHER_SUPPLIES]) {
+          return this.$tr('furtherExplanation');
+        }
+        return '';
+      },
+    },
+    $trs: {
+      resourcesNeededLabel: 'Requirements',
+      furtherExplanation:
+        "Please add to the 'Description' field any additional supplies learners will need in order to use this resource",
+    },
+  };
+
+</script>
+<style lang="less">
+
+</style>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/activityDuration.spec.js b/contentcuration/contentcuration/frontend/shared/views/contentNodeFields/__tests__/activityDuration.spec.js
similarity index 94%
rename from contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/activityDuration.spec.js
rename to contentcuration/contentcuration/frontend/shared/views/contentNodeFields/__tests__/activityDuration.spec.js
index cb68ca3e26..c0701b6cc4 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/activityDuration.spec.js
+++ b/contentcuration/contentcuration/frontend/shared/views/contentNodeFields/__tests__/activityDuration.spec.js
@@ -1,7 +1,7 @@
 import Vue from 'vue';
 import Vuetify from 'vuetify';
 import { shallowMount, mount } from '@vue/test-utils';
-import ActivityDuration from '../ActivityDuration.vue';
+import ActivityDuration from '../CompletionOptions/ActivityDuration';
 
 Vue.use(Vuetify);
 
@@ -12,9 +12,9 @@ describe('ActivityDuration', () => {
   });
 
   describe(`minutes input`, () => {
-    const shortActivityMin = 1;
+    const shortActivityMin = 5;
     const shortActivityMax = 30;
-    const longActivityMin = 31;
+    const longActivityMin = 40;
     const longActivityMax = 120;
 
     describe(`convert seconds to minutes for display`, () => {
@@ -35,8 +35,6 @@ describe('ActivityDuration', () => {
         const seconds = 2400;
         const wrapper = mount(ActivityDuration);
         wrapper.vm.minutes = 40;
-        // Ensure debounced function gets called
-        wrapper.vm.handleUpdatedInput.flush();
 
         return Vue.nextTick().then(() => {
           const emittedTime = wrapper.emitted('input').pop()[0];
@@ -55,7 +53,7 @@ describe('ActivityDuration', () => {
         expect(wrapper.html()).toContain(`step="5"`);
         expect(wrapper.html()).not.toContain(`step="10"`);
       });
-      it(`minimum accepted input should be 1 minute`, () => {
+      it(`minimum accepted input should be 5 minutes`, () => {
         expect(wrapper.vm.minRange).toBe(shortActivityMin);
         expect(wrapper.vm.minRange).not.toBe(longActivityMin);
       });
@@ -75,7 +73,7 @@ describe('ActivityDuration', () => {
         expect(wrapper.html()).toContain(`step="10"`);
         expect(wrapper.html()).not.toContain(`step="5"`);
       });
-      it(`minimum accepted input should be 31 minutes`, () => {
+      it(`minimum accepted input should be 40 minutes`, () => {
         expect(wrapper.vm.minRange).not.toBe(shortActivityMin);
         expect(wrapper.vm.minRange).toBe(longActivityMin);
       });
diff --git a/contentcuration/contentcuration/frontend/shared/views/contentNodeFields/__tests__/categoryOptions.spec.js b/contentcuration/contentcuration/frontend/shared/views/contentNodeFields/__tests__/categoryOptions.spec.js
new file mode 100644
index 0000000000..4cfa9baa2b
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/shared/views/contentNodeFields/__tests__/categoryOptions.spec.js
@@ -0,0 +1,84 @@
+import Vue from 'vue';
+import Vuetify from 'vuetify';
+import { shallowMount } from '@vue/test-utils';
+import CategoryOptions from '../CategoryOptions.vue';
+
+Vue.use(Vuetify);
+
+function makeWrapper({ value = {}, nodeIds = ['node1'] } = {}) {
+  return shallowMount(CategoryOptions, {
+    propsData: {
+      value,
+      nodeIds,
+    },
+  });
+}
+
+describe('CategoryOptions', () => {
+  it('smoke test', () => {
+    const wrapper = makeWrapper();
+    expect(wrapper.isVueInstance()).toBe(true);
+  });
+  it('emits expected data', () => {
+    const wrapper = makeWrapper();
+    const value = 'string';
+    wrapper.vm.$emit('input', value);
+
+    expect(wrapper.emitted().input).toBeTruthy();
+    expect(wrapper.emitted().input.length).toBe(1);
+    expect(wrapper.emitted().input[0]).toEqual([value]);
+  });
+
+  describe('display', () => {
+    it('has a tooltip that displays the tree for value of an item', () => {
+      const wrapper = makeWrapper();
+      const item = 'd&WXdXWF.5QAjgfv7.BUMJJBnS'; // 'Dance'
+      const expectedToolTip = 'School - Arts - Dance';
+
+      expect(wrapper.vm.tooltipText(item)).toEqual(expectedToolTip);
+    });
+    it(`dropdown has 'levels' key necessary to display the nested structure of categories`, () => {
+      const wrapper = makeWrapper();
+      const dropdown = wrapper.vm.categoriesList;
+      const everyCategoryHasLevelsKey = dropdown.every(item => 'level' in item);
+
+      expect(everyCategoryHasLevelsKey).toBeTruthy();
+    });
+  });
+
+  describe('interactions', () => {
+    it('when user checks an item, that is emitted to the parent component', () => {
+      const wrapper = makeWrapper();
+      const item = 'abcd';
+      wrapper.vm.$emit = jest.fn();
+      wrapper.vm.add(item);
+
+      expect(wrapper.vm.$emit.mock.calls[0][0]).toBe('input');
+      expect(wrapper.vm.$emit.mock.calls[0][1]).toEqual({ abcd: ['node1'] });
+    });
+    it('when user unchecks an item, that is emitted to the parent component', () => {
+      const wrapper = makeWrapper();
+      const item = 'defj';
+      wrapper.vm.$emit = jest.fn();
+      wrapper.vm.remove(item);
+
+      expect(wrapper.vm.$emit.mock.calls[0][0]).toBe('input');
+      expect(wrapper.vm.$emit.mock.calls[0][1]).toEqual({});
+    });
+  });
+
+  describe('close button on chip interactions', () => {
+    it('in the autocomplete bar, the chip is removed when user clicks on its close button', async () => {
+      const wrapper = makeWrapper({
+        value: {
+          'remove me': ['node1'],
+          'keep me': ['node1'],
+        },
+      });
+      const originalChipsLength = Object.keys(wrapper.vm.selected).length;
+      wrapper.vm.remove('remove me');
+
+      expect(wrapper.emitted().input.length).toEqual(originalChipsLength - 1);
+    });
+  });
+});
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/completionOptions.spec.js b/contentcuration/contentcuration/frontend/shared/views/contentNodeFields/__tests__/completionOptions.spec.js
similarity index 99%
rename from contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/completionOptions.spec.js
rename to contentcuration/contentcuration/frontend/shared/views/contentNodeFields/__tests__/completionOptions.spec.js
index db75897951..15599341b9 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/completionOptions.spec.js
+++ b/contentcuration/contentcuration/frontend/shared/views/contentNodeFields/__tests__/completionOptions.spec.js
@@ -1,7 +1,7 @@
 import Vue from 'vue';
 import Vuetify from 'vuetify';
 import { shallowMount, mount } from '@vue/test-utils';
-import CompletionOptions from '../CompletionOptions.vue';
+import CompletionOptions from '../CompletionOptions';
 import { CompletionCriteriaModels } from 'shared/constants';
 
 Vue.use(Vuetify);
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/learningActivityOptions.spec.js b/contentcuration/contentcuration/frontend/shared/views/contentNodeFields/__tests__/learningActivityOptions.spec.js
similarity index 72%
rename from contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/learningActivityOptions.spec.js
rename to contentcuration/contentcuration/frontend/shared/views/contentNodeFields/__tests__/learningActivityOptions.spec.js
index 1dffac7921..c3767d3c8a 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/learningActivityOptions.spec.js
+++ b/contentcuration/contentcuration/frontend/shared/views/contentNodeFields/__tests__/learningActivityOptions.spec.js
@@ -6,10 +6,11 @@ import { LearningActivities } from 'shared/constants';
 
 Vue.use(Vuetify);
 
-function makeWrapper(value) {
+function makeWrapper({ value = {}, nodeIds = ['node1'] } = {}) {
   return mount(LearningActivityOptions, {
     propsData: {
       value,
+      nodeIds,
     },
   });
 }
@@ -21,7 +22,7 @@ describe('LearningActivityOptions', () => {
   });
 
   it('number of items in the dropdown should be equal to number of items available in ', async () => {
-    const wrapper = makeWrapper([]);
+    const wrapper = makeWrapper();
     await wrapper.find('.v-input__slot').trigger('click');
 
     const numberOfDropdownItems = Object.keys(LearningActivities).length;
@@ -32,27 +33,35 @@ describe('LearningActivityOptions', () => {
 
   describe('updating state', () => {
     it('should update learning_activity field with new values received from a parent', () => {
-      const learningActivity = ['activity_1', 'activity_2'];
-      const wrapper = makeWrapper(learningActivity);
+      const learningActivity = {
+        activity_1: ['node1'],
+        activity_2: ['node1'],
+      };
+      const wrapper = makeWrapper({ value: learningActivity, nodeIds: ['node1'] });
       const dropdown = wrapper.find({ name: 'v-select' });
 
-      expect(dropdown.props('value')).toEqual(learningActivity);
+      expect(dropdown.props('value')).toEqual(['activity_1', 'activity_2']);
 
       wrapper.setProps({
-        value: ['activity_4'],
+        value: {
+          activity_4: ['node1'],
+        },
       });
       expect(dropdown.props('value')).toEqual(['activity_4']);
     });
 
     it('should emit new input values', () => {
-      const learningActivity = ['activity_1', 'activity_2', 'activity_3'];
-      const wrapper = makeWrapper({});
+      const learningActivity = ['activity_1', 'activity_2'];
+      const wrapper = makeWrapper();
       const dropdown = wrapper.find({ name: 'v-select' });
       dropdown.vm.$emit('input', learningActivity);
 
       return Vue.nextTick().then(() => {
         const emittedLevels = wrapper.emitted('input').pop()[0];
-        expect(emittedLevels).toEqual(learningActivity);
+        expect(emittedLevels).toEqual({
+          activity_1: ['node1'],
+          activity_2: ['node1'],
+        });
       });
     });
   });
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/levelsOptions.spec.js b/contentcuration/contentcuration/frontend/shared/views/contentNodeFields/__tests__/levelsOptions.spec.js
similarity index 67%
rename from contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/levelsOptions.spec.js
rename to contentcuration/contentcuration/frontend/shared/views/contentNodeFields/__tests__/levelsOptions.spec.js
index 9fab21ed16..f306d1b50b 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/levelsOptions.spec.js
+++ b/contentcuration/contentcuration/frontend/shared/views/contentNodeFields/__tests__/levelsOptions.spec.js
@@ -6,10 +6,11 @@ import { ContentLevels } from 'shared/constants';
 
 Vue.use(Vuetify);
 
-function makeWrapper(value) {
+function makeWrapper({ value = {}, nodeIds = ['node1'] } = {}) {
   return mount(LevelsOptions, {
     propsData: {
       value,
+      nodeIds,
     },
   });
 }
@@ -22,7 +23,7 @@ describe('LevelsOptions', () => {
   });
 
   it('number of items in the dropdown should be equal to number of items available in ContentLevels', async () => {
-    const wrapper = makeWrapper([]);
+    const wrapper = makeWrapper();
     await wrapper.find('.v-input__slot').trigger('click');
 
     const numberOfAvailableLevels = Object.keys(ContentLevels).length;
@@ -33,27 +34,37 @@ describe('LevelsOptions', () => {
 
   describe('updating state', () => {
     it('should update levels field with new values received from a parent', () => {
-      const levels = ['abc', 'gefo'];
-      const wrapper = makeWrapper(levels);
+      const value = {
+        abc: ['node1'],
+        gefo: ['node1'],
+      };
+      const wrapper = makeWrapper({ value, nodeIds: ['node1'] });
       const dropdown = wrapper.find({ name: 'v-select' });
 
-      expect(dropdown.props('value')).toEqual(levels);
+      expect(dropdown.props('value')).toEqual(['abc', 'gefo']);
 
       wrapper.setProps({
-        value: ['def'],
+        value: {
+          def: ['node1'],
+        },
       });
       expect(dropdown.props('value')).toEqual(['def']);
     });
 
     it('should emit new input values', () => {
-      const levels = ['abc', 'gefo', '8hw'];
-      const wrapper = makeWrapper({});
+      const value = {
+        abc: ['node1'],
+      };
+      const wrapper = makeWrapper({ value, nodeIds: ['node1'] });
       const dropdown = wrapper.find({ name: 'v-select' });
-      dropdown.vm.$emit('input', levels);
+      dropdown.vm.$emit('input', ['abc', 'gefo']);
 
       return Vue.nextTick().then(() => {
         const emittedLevels = wrapper.emitted('input').pop()[0];
-        expect(emittedLevels).toEqual(levels);
+        expect(emittedLevels).toEqual({
+          abc: ['node1'],
+          gefo: ['node1'],
+        });
       });
     });
   });
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/masteryCriteriaGoal.spec.js b/contentcuration/contentcuration/frontend/shared/views/contentNodeFields/__tests__/masteryCriteriaGoal.spec.js
similarity index 95%
rename from contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/masteryCriteriaGoal.spec.js
rename to contentcuration/contentcuration/frontend/shared/views/contentNodeFields/__tests__/masteryCriteriaGoal.spec.js
index 81d7e17bb5..464c3e7b7d 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/masteryCriteriaGoal.spec.js
+++ b/contentcuration/contentcuration/frontend/shared/views/contentNodeFields/__tests__/masteryCriteriaGoal.spec.js
@@ -1,6 +1,6 @@
 import { mount } from '@vue/test-utils';
-import TestForm from '../../../../shared/views/__tests__/TestForm.vue';
-import MasteryCriteriaGoal from '../MasteryCriteriaGoal.vue';
+import MasteryCriteriaGoal from '../CompletionOptions/MasteryCriteriaGoal';
+import TestForm from 'shared/views/__tests__/TestForm';
 import { constantStrings } from 'shared/mixins';
 import MasteryModels from 'shared/leUtils/MasteryModels';
 
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/masteryCriteriaMofNFields.spec.js b/contentcuration/contentcuration/frontend/shared/views/contentNodeFields/__tests__/masteryCriteriaMofNFields.spec.js
similarity index 97%
rename from contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/masteryCriteriaMofNFields.spec.js
rename to contentcuration/contentcuration/frontend/shared/views/contentNodeFields/__tests__/masteryCriteriaMofNFields.spec.js
index 573009eaf8..c14b3e674a 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/masteryCriteriaMofNFields.spec.js
+++ b/contentcuration/contentcuration/frontend/shared/views/contentNodeFields/__tests__/masteryCriteriaMofNFields.spec.js
@@ -1,6 +1,6 @@
 import { mount } from '@vue/test-utils';
-import TestForm from '../../../../shared/views/__tests__/TestForm.vue';
-import MasteryCriteriaMofNFields from '../MasteryCriteriaMofNFields.vue';
+import MasteryCriteriaMofNFields from '../CompletionOptions/MasteryCriteriaMofNFields';
+import TestForm from 'shared/views/__tests__/TestForm';
 
 document.body.setAttribute('data-app', true); // Vuetify prints a warning without this
 
diff --git a/contentcuration/contentcuration/frontend/shared/views/contentNodeFields/__tests__/resourcesNeededOptions.spec.js b/contentcuration/contentcuration/frontend/shared/views/contentNodeFields/__tests__/resourcesNeededOptions.spec.js
new file mode 100644
index 0000000000..cc0757a09b
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/shared/views/contentNodeFields/__tests__/resourcesNeededOptions.spec.js
@@ -0,0 +1,60 @@
+import Vue from 'vue';
+import Vuetify from 'vuetify';
+import { mount } from '@vue/test-utils';
+import ResourcesNeededOptions from '../ResourcesNeededOptions.vue';
+
+Vue.use(Vuetify);
+
+function makeWrapper({ value = {}, nodeIds = ['node1'] } = {}) {
+  return mount(ResourcesNeededOptions, {
+    propsData: {
+      value,
+      nodeIds,
+    },
+  });
+}
+
+describe('ResourcesNeededOptions', () => {
+  it('smoke test', () => {
+    const wrapper = makeWrapper();
+
+    expect(wrapper.isVueInstance()).toBe(true);
+  });
+
+  describe('updating state', () => {
+    it('should update resources field with new values received from a parent', () => {
+      const value = {
+        person: ['node1'],
+        book: ['node1'],
+      };
+      const wrapper = makeWrapper({ value, nodeIds: ['node1'] });
+      const dropdown = wrapper.find({ name: 'v-select' });
+
+      expect(dropdown.props('value')).toEqual(['person', 'book']);
+
+      wrapper.setProps({
+        value: {
+          train: ['node1'],
+        },
+      });
+      expect(dropdown.props('value')).toEqual(['train']);
+    });
+
+    it('should emit new input values', async () => {
+      const resourcesNeeded = {
+        person: ['node1'],
+      };
+      const wrapper = makeWrapper({ value: resourcesNeeded, nodeIds: ['node1'] });
+      const dropdown = wrapper.find({ name: 'v-select' });
+      dropdown.vm.$emit('input', ['person', 'book']);
+
+      await wrapper.vm.$nextTick();
+
+      const emittedLevels = wrapper.emitted('input').pop()[0];
+      expect(emittedLevels).toEqual({
+        person: ['node1'],
+        book: ['node1'],
+      });
+    });
+  });
+});
diff --git a/contentcuration/contentcuration/frontend/shared/views/form/Checkbox.vue b/contentcuration/contentcuration/frontend/shared/views/form/Checkbox.vue
index fab75de77f..3ca507ca20 100644
--- a/contentcuration/contentcuration/frontend/shared/views/form/Checkbox.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/form/Checkbox.vue
@@ -127,7 +127,8 @@
       },
     },
     methods: {
-      handleChange(checked) {
+      handleChange(checked, e) {
+        e.stopPropagation();
         this.isChecked = checked;
       },
       updateInputValue(newValue) {
@@ -146,4 +147,4 @@
     color: var(--v-text);
   }
 
-</style>
\ No newline at end of file
+</style>
diff --git a/contentcuration/contentcuration/frontend/shared/views/form/EmailField.vue b/contentcuration/contentcuration/frontend/shared/views/form/EmailField.vue
index fe0e641c42..ad28d0b91e 100644
--- a/contentcuration/contentcuration/frontend/shared/views/form/EmailField.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/form/EmailField.vue
@@ -17,6 +17,8 @@
 
 <script>
 
+  import commonStrings from 'shared/translator';
+
   export default {
     name: 'EmailField',
     props: {
@@ -46,7 +48,8 @@
       emailRules() {
         // TODO: fix checking if email exists
         return [
-          v => (!this.required || v.trim() ? true : this.$tr('emailRequiredMessage')),
+          /* eslint-disable-next-line kolibri/vue-no-undefined-string-uses */
+          v => (!this.required || v.trim() ? true : commonStrings.$tr('fieldRequired')),
           v => /.+@.+\..+/.test(v) || this.$tr('validEmailMessage'),
         ];
       },
@@ -54,7 +57,6 @@
     $trs: {
       emailLabel: 'Email',
       validEmailMessage: 'Please enter a valid email',
-      emailRequiredMessage: 'Field is required',
     },
   };
 
diff --git a/contentcuration/contentcuration/frontend/shared/views/form/ExpandableSelect.vue b/contentcuration/contentcuration/frontend/shared/views/form/ExpandableSelect.vue
new file mode 100644
index 0000000000..127eeabd7a
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/shared/views/form/ExpandableSelect.vue
@@ -0,0 +1,219 @@
+<template>
+
+  <DropdownWrapper
+    v-if="!expanded"
+    component="VFlex"
+    v-bind="$attrs"
+  >
+    <template #default="{ attach, menuProps }">
+      <VSelect
+        v-model="selectInputValueModel"
+        box
+        :disabled="disabled"
+        :placeholder="placeholder"
+        :items="options"
+        :label="label"
+        :required="required"
+        :rules="rules"
+        :menu-props="menuProps"
+        :attach="attach"
+        :chips="multiple"
+        :multiple="multiple"
+        :clearable="multiple"
+        :deletableChips="multiple"
+        :hint="hint"
+        :persistent-hint="!!hint"
+        @focus="$emit('focus')"
+      />
+    </template>
+  </DropdownWrapper>
+  <div
+    v-else
+    :class="disabled ? 'disabled' : ''"
+  >
+    <h5 v-if="!hideLabel">
+      {{ label }}
+    </h5>
+    <div>
+      <template v-if="!multiple">
+        <KRadioButton
+          v-for="option in options"
+          :key="option.value"
+          v-model="valueModel"
+          :buttonValue="option.value"
+          :label="option.text"
+        />
+      </template>
+      <template v-else>
+        <KCheckbox
+          v-for="option in options"
+          :key="option.value"
+          :label="option.text"
+          :checked="isSelected(option.value)"
+          :indeterminate="isIndeterminate(option.value)"
+          data-test="option-checkbox"
+          @change="value => setOption(option.value, value)"
+        />
+      </template>
+    </div>
+    <p
+      v-if="hint"
+      :style="{ color: $themeTokens.annotation }"
+    >
+      {{ hint }}
+    </p>
+
+  </div>
+
+</template>
+
+<script>
+
+  import DropdownWrapper from './DropdownWrapper';
+  import { getInvalidText } from 'shared/utils/validation';
+
+  export default {
+    name: 'ExpandableSelect',
+    components: { DropdownWrapper },
+    props: {
+      /**
+       * It can receive a value as a string for single select or an object with
+       * the following structure for multiple select:
+       * {
+       *   [optionId]: [itemId1, itemId2, ...]
+       * }
+       * where itemId is the id of the item that has the option selected
+       */
+      value: {
+        type: [String, Object],
+        required: true,
+      },
+      options: {
+        type: Array,
+        required: true,
+      },
+      /**
+       * If the select is multiple, this prop is required, and it
+       * represents the available items that can have the options selected
+       */
+      availableItems: {
+        type: Array,
+        required: false,
+        default: () => [],
+      },
+      placeholder: {
+        type: String,
+        required: false,
+        default: '',
+      },
+      label: {
+        type: String,
+        required: false,
+        default: '',
+      },
+      hideLabel: {
+        type: Boolean,
+        required: false,
+        default: false,
+      },
+      rules: {
+        type: Array,
+        required: false,
+        default: () => [],
+      },
+      required: {
+        type: Boolean,
+        default: true,
+      },
+      disabled: {
+        type: Boolean,
+        default: false,
+      },
+      expanded: {
+        type: Boolean,
+        default: false,
+      },
+      multiple: {
+        type: Boolean,
+        default: false,
+      },
+      hint: {
+        type: String,
+        default: '',
+      },
+    },
+    computed: {
+      valueModel: {
+        get() {
+          return this.value;
+        },
+        set(value) {
+          this.$emit('input', value);
+        },
+      },
+      selectInputValueModel: {
+        get() {
+          if (this.multiple) {
+            return Object.keys(this.valueModel).filter(
+              key => this.valueModel[key].length === this.availableItems.length
+            );
+          }
+          return this.valueModel;
+        },
+        set(value) {
+          if (this.multiple) {
+            const newValueModel = {};
+            value.forEach(optionId => {
+              newValueModel[optionId] = this.availableItems;
+            });
+            this.valueModel = newValueModel;
+          } else {
+            this.valueModel = value;
+          }
+        },
+      },
+    },
+    methods: {
+      /**
+       * @public
+       */
+      validate() {
+        if (this.rules && this.rules.length) {
+          return getInvalidText(this.rules, this.valueModel);
+        }
+      },
+      isSelected(value) {
+        if (!this.valueModel[value]) {
+          return false;
+        }
+        return this.valueModel[value].length === this.availableItems.length;
+      },
+      isIndeterminate(value) {
+        if (!this.valueModel[value]) {
+          return false;
+        }
+        return this.valueModel[value].length < this.availableItems.length;
+      },
+      setOption(optionId, value) {
+        if (value) {
+          this.valueModel = {
+            ...this.valueModel,
+            [optionId]: this.availableItems,
+          };
+        } else {
+          const newValueModel = { ...this.valueModel };
+          delete newValueModel[optionId];
+          this.valueModel = newValueModel;
+        }
+      },
+    },
+  };
+
+</script>
+
+<style scoped>
+  .disabled {
+    pointer-events: none;
+    opacity: 0.5;
+  }
+</style>
\ No newline at end of file
diff --git a/contentcuration/contentcuration/frontend/shared/views/form/PasswordField.vue b/contentcuration/contentcuration/frontend/shared/views/form/PasswordField.vue
index 69e1e44e14..e82df91b74 100644
--- a/contentcuration/contentcuration/frontend/shared/views/form/PasswordField.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/form/PasswordField.vue
@@ -7,6 +7,7 @@
     :rules="rules"
     :label="label || $tr('passwordLabel')"
     :validate-on-blur="!validate"
+    :error-messages="errorMessages"
     type="password"
     @keyup.enter="validate = true"
     @keydown="validate = false"
@@ -17,6 +18,8 @@
 
 <script>
 
+  import commonStrings from 'shared/translator';
+
   export default {
     name: 'PasswordField',
     props: {
@@ -40,6 +43,12 @@
         type: Boolean,
         default: true,
       },
+      errorMessages: {
+        type: Array,
+        default() {
+          return [];
+        },
+      },
     },
     data() {
       return {
@@ -56,14 +65,14 @@
         },
       },
       rules() {
-        return [v => (!this.required || v ? true : this.$tr('fieldRequiredMessage'))].concat(
+        /* eslint-disable-next-line kolibri/vue-no-undefined-string-uses */
+        return [v => (!this.required || v ? true : commonStrings.$tr('fieldRequired'))].concat(
           this.additionalRules
         );
       },
     },
     $trs: {
       passwordLabel: 'Password',
-      fieldRequiredMessage: 'Field is required',
     },
   };
 
diff --git a/contentcuration/contentcuration/frontend/shared/views/policies/CommunityStandardsModal.vue b/contentcuration/contentcuration/frontend/shared/views/policies/CommunityStandardsModal.vue
index e861a29652..03d0e9a341 100644
--- a/contentcuration/contentcuration/frontend/shared/views/policies/CommunityStandardsModal.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/policies/CommunityStandardsModal.vue
@@ -5,7 +5,7 @@
     :title="title"
     :needsAcceptance="needsAcceptance"
     data-test="community-standards-modal"
-    @accept="$emit('accept')"
+    @accept="$emit('accept', policy)"
     @close="$emit('close')"
   >
     <p>{{ $tr('description') }}</p>
diff --git a/contentcuration/contentcuration/frontend/shared/views/policies/PolicyModals.vue b/contentcuration/contentcuration/frontend/shared/views/policies/PolicyModals.vue
index 08ffc30646..b1a1f3e0a4 100644
--- a/contentcuration/contentcuration/frontend/shared/views/policies/PolicyModals.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/policies/PolicyModals.vue
@@ -4,21 +4,21 @@
     <TermsOfServiceModal
       v-if="showTermsOfService"
       :needsAcceptance="isPolicyUnaccepted(policies.TERMS_OF_SERVICE)"
-      @accept="acceptPolicy(getPolicyAcceptedData(policies.TERMS_OF_SERVICE))"
-      @close="closePolicy(policies.TERMS_OF_SERVICE)"
-      @open="policy => openPolicy(policy)"
+      @accept="handleAcceptPolicy"
+      @open="openPolicy"
+      @close="closePolicy"
     />
     <PrivacyPolicyModal
       v-if="showPrivacyPolicy"
       :needsAcceptance="isPolicyUnaccepted(policies.PRIVACY)"
-      @accept="acceptPolicy(getPolicyAcceptedData(policies.PRIVACY))"
-      @close="closePolicy(policies.PRIVACY)"
-      @open="policy => openPolicy(policy)"
+      @accept="handleAcceptPolicy"
+      @open="openPolicy"
+      @close="closePolicy"
     />
     <CommunityStandardsModal
       v-if="showCommunityStandards"
       :needsAcceptance="false"
-      @close="closePolicy(policies.COMMUNITY_STANDARDS)"
+      @close="closePolicy"
     />
   </div>
 
@@ -26,6 +26,7 @@
 
 <script>
 
+  import get from 'lodash/get';
   import { mapActions, mapGetters } from 'vuex';
   import PrivacyPolicyModal from './PrivacyPolicyModal';
   import TermsOfServiceModal from './TermsOfServiceModal';
@@ -40,13 +41,10 @@
       TermsOfServiceModal,
     },
     data() {
-      return {
-        policies,
-      };
+      return { policies };
     },
     computed: {
       ...mapGetters('policies', [
-        'selectedPolicy',
         'getPolicyAcceptedData',
         'isPolicyUnaccepted',
         'firstUnacceptedPolicy',
@@ -66,9 +64,24 @@
       showCommunityStandards() {
         return this.selectedPolicy === policies.COMMUNITY_STANDARDS;
       },
+      selectedPolicy() {
+        // Effectively results in watching the route query
+        return get(this, '$route.query.showPolicy', this.firstUnacceptedPolicy);
+      },
     },
     methods: {
-      ...mapActions('policies', ['acceptPolicy', 'openPolicy', 'closePolicy']),
+      ...mapActions('policies', ['acceptPolicy']),
+      openPolicy(policy) {
+        const toRoute = this.$route;
+        toRoute.query.showPolicy = policy;
+        this.$router.push(toRoute);
+      },
+      closePolicy() {
+        this.$router.push({ query: {} });
+      },
+      handleAcceptPolicy(policy) {
+        this.acceptPolicy(this.getPolicyAcceptedData(policy)).then(this.closePolicy);
+      },
     },
   };
 
diff --git a/contentcuration/contentcuration/frontend/shared/views/policies/PrivacyPolicyModal.vue b/contentcuration/contentcuration/frontend/shared/views/policies/PrivacyPolicyModal.vue
index 016cdbbbfd..af53312b56 100644
--- a/contentcuration/contentcuration/frontend/shared/views/policies/PrivacyPolicyModal.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/policies/PrivacyPolicyModal.vue
@@ -5,7 +5,7 @@
     :title="title"
     :needsAcceptance="needsAcceptance"
     data-test="privacy-modal"
-    @accept="$emit('accept')"
+    @accept="$emit('accept', policy)"
     @close="$emit('close')"
   >
     <div class="privacy-wrapper" dir="auto">
@@ -16,7 +16,7 @@
         {{ $untranslated('introductionP1Part1') }}
         <ActionLink
           :text="$untranslated('introductionP1TC')"
-          @click="$emit('open', policies.TERMS_OF_SERVICE)"
+          @click="$router.push({ query: { showPolicy: policies.COMMUNITY_STANDARDS } })"
         />
         {{ $untranslated('introductionP1Part2') }}
         <b>{{ $untranslated('introductionP1TU') }}</b>
@@ -204,7 +204,7 @@
           {{ $untranslated('expectationOfPrivacyP1') }}
           <ActionLink
             :text="$untranslated('expectationOfPrivacyP1TC')"
-            @click="$emit('open', policies.TERMS_OF_SERVICE)"
+            @click="$router.push({ query: { showPolicy: policies.TERMS_OF_SERVICE } })"
           />
         </p>
       </div>
diff --git a/contentcuration/contentcuration/frontend/shared/views/policies/TermsOfServiceModal.vue b/contentcuration/contentcuration/frontend/shared/views/policies/TermsOfServiceModal.vue
index 2668b4d9f7..5f6cf6fe52 100644
--- a/contentcuration/contentcuration/frontend/shared/views/policies/TermsOfServiceModal.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/policies/TermsOfServiceModal.vue
@@ -5,7 +5,7 @@
     :title="title"
     :needsAcceptance="needsAcceptance"
     data-test="tos-modal"
-    @accept="$emit('accept')"
+    @accept="$emit('accept', policy)"
     @close="$emit('close')"
   >
     <div class="tos-wrapper">
@@ -186,7 +186,7 @@
         <p>
           <ActionLink
             :text="$tr('communityStandardsLink')"
-            @click="$emit('open', policies.COMMUNITY_STANDARDS)"
+            @click="$router.push({ query: { showPolicy: policies.COMMUNITY_STANDARDS } })"
           />
         </p>
       </div>
@@ -198,7 +198,7 @@
         <p>
           <ActionLink
             :text="$tr('yourPrivacyLink')"
-            @click="$emit('open', policies.PRIVACY)"
+            @click="$router.push({ query: { showPolicy: policies.PRIVACY } })"
           />
         </p>
       </div>
diff --git a/contentcuration/contentcuration/frontend/shared/views/policies/__tests__/policyModals.spec.js b/contentcuration/contentcuration/frontend/shared/views/policies/__tests__/policyModals.spec.js
index 0415bc141a..da1da3aad8 100644
--- a/contentcuration/contentcuration/frontend/shared/views/policies/__tests__/policyModals.spec.js
+++ b/contentcuration/contentcuration/frontend/shared/views/policies/__tests__/policyModals.spec.js
@@ -1,6 +1,8 @@
 import { mount, createLocalVue } from '@vue/test-utils';
 import Vuex from 'vuex';
+import VueRouter from 'vue-router';
 import cloneDeep from 'lodash/cloneDeep';
+import router from '../../../../accounts/router';
 
 import PolicyModals from '../PolicyModals.vue';
 import storeFactory from 'shared/vuex/baseStore';
@@ -9,6 +11,7 @@ import POLICIES_MODULE_CONFIG from 'shared/vuex/policies';
 
 const localVue = createLocalVue();
 localVue.use(Vuex);
+localVue.use(VueRouter);
 
 function getTermsOfServiceModal(wrapper) {
   return wrapper.find('[data-test="tos-modal"]');
@@ -22,10 +25,16 @@ function getCommunityStandardsModal(wrapper) {
   return wrapper.find('[data-test="community-standards-modal"]');
 }
 
-function makeWrapper({ propsData, store }) {
+function makeWrapper({ propsData, store, showPolicy }) {
+  if (showPolicy) {
+    router.replace({ query: { showPolicy } });
+  } else {
+    router.replace({ query: {} });
+  }
   return mount(PolicyModals, {
     propsData,
     localVue,
+    router,
     store,
   });
 }
@@ -33,7 +42,9 @@ function makeWrapper({ propsData, store }) {
 describe('policyModals', () => {
   it('smoke test', () => {
     const store = storeFactory();
-    const wrapper = makeWrapper({ store });
+    const wrapper = makeWrapper({
+      store: { ...store, state: { ...store.state, loggedIn: false } },
+    });
 
     expect(wrapper.isVueInstance()).toBe(true);
     expect(wrapper.is(PolicyModals)).toBe(true);
@@ -42,8 +53,7 @@ describe('policyModals', () => {
   it(`should show only terms of service modal
     when terms of service policy is selected`, () => {
     const store = storeFactory();
-    store.commit('policies/SET_SELECTED_POLICY', policies.TERMS_OF_SERVICE);
-    const wrapper = makeWrapper({ store });
+    const wrapper = makeWrapper({ store, showPolicy: policies.TERMS_OF_SERVICE });
 
     expect(getTermsOfServiceModal(wrapper).exists()).toBe(true);
     expect(getTermsOfServiceModal(wrapper).isVisible()).toBe(true);
@@ -60,8 +70,8 @@ describe('policyModals', () => {
       .mockReturnValue(policies.TERMS_OF_SERVICE);
     const store = storeFactory({ modules: { policies: policiesModule } });
     const wrapper = makeWrapper({ store });
-    // make sure that no policy is selected
-    expect(wrapper.vm.$store.getters['policies/selectedPolicy']).toBeNull();
+    // make sure that the selected policy defaults to first unaccepted policy
+    expect(wrapper.vm.selectedPolicy).toBe(policies.TERMS_OF_SERVICE);
 
     expect(getTermsOfServiceModal(wrapper).exists()).toBe(true);
     expect(getTermsOfServiceModal(wrapper).isVisible()).toBe(true);
@@ -72,8 +82,7 @@ describe('policyModals', () => {
   it(`should show only privacy policy modal
     when privacy policy is selected`, () => {
     const store = storeFactory();
-    store.commit('policies/SET_SELECTED_POLICY', policies.PRIVACY);
-    const wrapper = makeWrapper({ store });
+    const wrapper = makeWrapper({ store, showPolicy: policies.PRIVACY });
 
     expect(getPrivacyModal(wrapper).exists()).toBe(true);
     expect(getPrivacyModal(wrapper).isVisible()).toBe(true);
@@ -88,8 +97,8 @@ describe('policyModals', () => {
     jest.spyOn(policiesModule.getters, 'firstUnacceptedPolicy').mockReturnValue(policies.PRIVACY);
     const store = storeFactory({ modules: { policies: policiesModule } });
     const wrapper = makeWrapper({ store });
-    // make sure that no policy is selected
-    expect(wrapper.vm.$store.getters['policies/selectedPolicy']).toBeNull();
+    // make sure that the selected policy defaults to first unaccepted policy
+    expect(wrapper.vm.selectedPolicy).toBe(policies.PRIVACY);
 
     expect(getPrivacyModal(wrapper).exists()).toBe(true);
     expect(getPrivacyModal(wrapper).isVisible()).toBe(true);
@@ -100,8 +109,7 @@ describe('policyModals', () => {
   it(`should should show only community standards modal
     when community standards policy is selected`, () => {
     const store = storeFactory();
-    store.commit('policies/SET_SELECTED_POLICY', policies.COMMUNITY_STANDARDS);
-    const wrapper = makeWrapper({ store });
+    const wrapper = makeWrapper({ store, showPolicy: policies.COMMUNITY_STANDARDS });
 
     expect(getCommunityStandardsModal(wrapper).exists()).toBe(true);
     expect(getCommunityStandardsModal(wrapper).isVisible()).toBe(true);
@@ -117,8 +125,7 @@ describe('policyModals', () => {
     const policiesModule = cloneDeep(POLICIES_MODULE_CONFIG);
     jest.spyOn(policiesModule.getters, 'firstUnacceptedPolicy').mockReturnValue(policies.PRIVACY);
     const store = storeFactory({ modules: { policies: policiesModule } });
-    store.commit('policies/SET_SELECTED_POLICY', policies.TERMS_OF_SERVICE);
-    const wrapper = makeWrapper({ store });
+    const wrapper = makeWrapper({ store, showPolicy: policies.TERMS_OF_SERVICE });
 
     expect(getTermsOfServiceModal(wrapper).exists()).toBe(true);
     expect(getTermsOfServiceModal(wrapper).isVisible()).toBe(true);
diff --git a/contentcuration/contentcuration/frontend/shared/vuex/policies/index.js b/contentcuration/contentcuration/frontend/shared/vuex/policies/index.js
index 2a2e30baa3..e09ba0f5b5 100644
--- a/contentcuration/contentcuration/frontend/shared/vuex/policies/index.js
+++ b/contentcuration/contentcuration/frontend/shared/vuex/policies/index.js
@@ -62,9 +62,6 @@ export const getters = {
       return getters.nonAcceptedPolicies.includes(policy);
     };
   },
-  selectedPolicy(state) {
-    return state.selectedPolicy;
-  },
   /**
    * @returns There can be more unaccepted policies.
    * This getter returns the first of them when sorted
@@ -85,9 +82,6 @@ export const getters = {
 };
 
 export const mutations = {
-  SET_SELECTED_POLICY(state, policy) {
-    state.selectedPolicy = policy;
-  },
   SET_POLICIES(state, policies) {
     for (const policy in policies) {
       Vue.set(state.policies, policy, policies[policy]);
@@ -99,14 +93,6 @@ export const actions = {
   setPolicies(context, policies) {
     context.commit('SET_POLICIES', policies);
   },
-  openPolicy(context, policy) {
-    context.commit('SET_SELECTED_POLICY', policy);
-  },
-  closePolicy(context, policy) {
-    if (context.state.selectedPolicy === policy) {
-      context.commit('SET_SELECTED_POLICY', null);
-    }
-  },
   /**
    * Accept a policy
    *
@@ -118,11 +104,7 @@ export const actions = {
   acceptPolicy(context, policyAcceptedData) {
     return client
       .post(window.Urls.policy_update(), { policy: JSON.stringify(policyAcceptedData) })
-      .then(() => {
-        return context
-          .dispatch('setPolicies', policyAcceptedData)
-          .then(() => context.dispatch('closePolicy'));
-      });
+      .then(() => context.dispatch('setPolicies', policyAcceptedData));
   },
 };
 
@@ -131,7 +113,6 @@ export default {
   state() {
     return {
       policies: {},
-      selectedPolicy: null,
     };
   },
   getters,
diff --git a/contentcuration/contentcuration/frontend/shared/vuex/policies/index.spec.js b/contentcuration/contentcuration/frontend/shared/vuex/policies/index.spec.js
index 04f92031ad..7bf7452676 100644
--- a/contentcuration/contentcuration/frontend/shared/vuex/policies/index.spec.js
+++ b/contentcuration/contentcuration/frontend/shared/vuex/policies/index.spec.js
@@ -138,9 +138,8 @@ describe('policies store', () => {
         const policyAcceptedData = { privacy_policy_2020_12_10: '12/05/2021 09:56' };
         await actions.acceptPolicy({ getters, dispatch }, policyAcceptedData);
 
-        expect(dispatch.mock.calls.length).toBe(2);
+        expect(dispatch.mock.calls.length).toBe(1);
         expect(dispatch.mock.calls[0]).toEqual(['setPolicies', policyAcceptedData]);
-        expect(dispatch.mock.calls[1]).toEqual(['closePolicy']);
       });
     });
   });
diff --git a/contentcuration/contentcuration/migrations/0149_unpublishable_change_field.py b/contentcuration/contentcuration/migrations/0149_unpublishable_change_field.py
new file mode 100644
index 0000000000..a1ebff4d29
--- /dev/null
+++ b/contentcuration/contentcuration/migrations/0149_unpublishable_change_field.py
@@ -0,0 +1,25 @@
+# Generated by Django 3.2.19 on 2024-08-09 18:28
+from django.db import migrations
+from django.db import models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contentcuration', '0148_flagfeedbackevent_recommendationsevent_recommendationsinteractionevent'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='change',
+            name='unpublishable',
+            field=models.BooleanField(blank=True, null=True),
+        ),
+        # Add default to False in a separate migration operation
+        # to avoid expensive backfilling of the new column for existing rows
+        migrations.AlterField(
+            model_name='change',
+            name='unpublishable',
+            field=models.BooleanField(blank=True, default=False, null=True),
+        ),
+    ]
diff --git a/contentcuration/contentcuration/models.py b/contentcuration/contentcuration/models.py
index f1a334fefe..690325fc3c 100644
--- a/contentcuration/contentcuration/models.py
+++ b/contentcuration/contentcuration/models.py
@@ -77,6 +77,8 @@
 from contentcuration.utils.parser import load_json_string
 from contentcuration.viewsets.sync.constants import ALL_CHANGES
 from contentcuration.viewsets.sync.constants import ALL_TABLES
+from contentcuration.viewsets.sync.constants import PUBLISHABLE_CHANGE_TABLES
+from contentcuration.viewsets.sync.constants import PUBLISHED
 
 
 EDIT_ACCESS = "edit"
@@ -292,6 +294,10 @@ def check_space(self, size, checksum):
         if space < size:
             raise PermissionDenied(_("Not enough space. Check your storage under Settings page."))
 
+    def check_feature_flag(self, flag_name):
+        feature_flags = self.feature_flags or {}
+        return feature_flags.get(flag_name, False)
+
     def check_channel_space(self, channel):
         active_files = self.get_user_active_files()
         staging_tree_id = channel.staging_tree.tree_id
@@ -1882,7 +1888,7 @@ def mark_complete(self):  # noqa C901
                     except completion_criteria.ValidationError:
                         errors.append("Mastery criterion is defined but is invalid")
             else:
-                criterion = self.extra_fields.get("options", {}).get("completion_criteria", {})
+                criterion = self.extra_fields and self.extra_fields.get("options", {}).get("completion_criteria", {})
                 if criterion:
                     try:
                         completion_criteria.validate(criterion, kind=self.kind_id)
@@ -2552,14 +2558,36 @@ class Change(models.Model):
     kwargs = JSONField(encoder=JSONEncoder)
     applied = models.BooleanField(default=False)
     errored = models.BooleanField(default=False)
+    # Add an additional flag for change events that are only intended
+    # to transmit a message to the client, and not to actually apply any publishable changes.
+    # Make it nullable, so that we don't have to back fill historic change objects, and we just
+    # exclude true values when we are looking for publishable changes.
+    # This deliberately uses 'unpublishable' so that we can easily filter out by 'not true',
+    # and also that if we are ever interacting with it in Python code, both null and False values
+    # will be falsy.
+    unpublishable = models.BooleanField(null=True, blank=True, default=False)
 
     @classmethod
-    def _create_from_change(cls, created_by_id=None, channel_id=None, user_id=None, session_key=None, applied=False, table=None, rev=None, **data):
+    def _create_from_change(
+        cls,
+        created_by_id=None,
+        channel_id=None,
+        user_id=None,
+        session_key=None,
+        applied=False,
+        table=None,
+        rev=None,
+        unpublishable=False,
+        **data
+    ):
         change_type = data.pop("type")
         if table is None or table not in ALL_TABLES:
             raise TypeError("table is a required argument for creating changes and must be a valid table name")
         if change_type is None or change_type not in ALL_CHANGES:
             raise TypeError("change_type is a required argument for creating changes and must be a valid change type integer")
+        # Don't let someone mark a change as unpublishable if it's not in the list of tables that make changes that we can publish
+        # also, by definition, publishing is not a publishable change - this probably doesn't matter, but making sense is nice.
+        unpublishable = unpublishable or table not in PUBLISHABLE_CHANGE_TABLES or change_type == PUBLISHED
         return cls(
             session_id=session_key,
             created_by_id=created_by_id,
@@ -2569,21 +2597,30 @@ def _create_from_change(cls, created_by_id=None, channel_id=None, user_id=None,
             table=table,
             change_type=change_type,
             kwargs=data,
-            applied=applied
+            applied=applied,
+            unpublishable=unpublishable,
         )
 
     @classmethod
-    def create_changes(cls, changes, created_by_id=None, session_key=None, applied=False):
+    def create_changes(cls, changes, created_by_id=None, session_key=None, applied=False, unpublishable=False):
         change_models = []
         for change in changes:
-            change_models.append(cls._create_from_change(created_by_id=created_by_id, session_key=session_key, applied=applied, **change))
+            change_models.append(
+                cls._create_from_change(
+                    created_by_id=created_by_id,
+                    session_key=session_key,
+                    applied=applied,
+                    unpublishable=unpublishable,
+                    **change
+                )
+            )
 
         cls.objects.bulk_create(change_models)
         return change_models
 
     @classmethod
-    def create_change(cls, change, created_by_id=None, session_key=None, applied=False):
-        obj = cls._create_from_change(created_by_id=created_by_id, session_key=session_key, applied=applied, **change)
+    def create_change(cls, change, created_by_id=None, session_key=None, applied=False, unpublishable=False):
+        obj = cls._create_from_change(created_by_id=created_by_id, session_key=session_key, applied=applied, unpublishable=unpublishable, **change)
         obj.save()
         return obj
 
diff --git a/contentcuration/contentcuration/tests/test_contentnodes.py b/contentcuration/contentcuration/tests/test_contentnodes.py
index 6c24498bfb..d9b0ae235d 100644
--- a/contentcuration/contentcuration/tests/test_contentnodes.py
+++ b/contentcuration/contentcuration/tests/test_contentnodes.py
@@ -1171,3 +1171,21 @@ def test_create_exercise_bad_new_extra_fields(self):
         AssessmentItem.objects.create(contentnode=new_obj, question="This is a question", answers="[{\"correct\": true, \"text\": \"answer\"}]")
         new_obj.mark_complete()
         self.assertFalse(new_obj.complete)
+
+    def test_create_video_null_extra_fields(self):
+        licenses = list(License.objects.filter(copyright_holder_required=False, is_custom=False).values_list("pk", flat=True))
+        channel = testdata.channel()
+        new_obj = ContentNode(
+            title="yes",
+            kind_id=content_kinds.VIDEO,
+            parent=channel.main_tree,
+            license_id=licenses[0],
+            copyright_holder="Some person",
+            extra_fields=None,
+        )
+        new_obj.save()
+        File.objects.create(contentnode=new_obj, preset_id=format_presets.VIDEO_HIGH_RES, checksum=uuid.uuid4().hex)
+        try:
+            new_obj.mark_complete()
+        except AttributeError:
+            self.fail("Null extra_fields not handled")
diff --git a/contentcuration/contentcuration/tests/test_serializers.py b/contentcuration/contentcuration/tests/test_serializers.py
index dcb9fea978..9ea2e2529c 100644
--- a/contentcuration/contentcuration/tests/test_serializers.py
+++ b/contentcuration/contentcuration/tests/test_serializers.py
@@ -9,9 +9,11 @@
 from contentcuration.models import Channel
 from contentcuration.models import ContentNode
 from contentcuration.models import DEFAULT_CONTENT_DEFAULTS
+from contentcuration.tests import testdata
 from contentcuration.viewsets.channel import ChannelSerializer as BaseChannelSerializer
 from contentcuration.viewsets.common import ContentDefaultsSerializer
 from contentcuration.viewsets.contentnode import ContentNodeSerializer
+from contentcuration.viewsets.feedback import FlagFeedbackEventSerializer
 
 
 def ensure_no_querysets_in_serializer(object):
@@ -182,3 +184,46 @@ def test_save__update(self):
         self.assertEqual(
             dict(author="Buster", license="Special Permissions"), c.content_defaults
         )
+
+
+class FlagFeedbackSerializerTestCase(BaseAPITestCase):
+    def setUp(self):
+        super(FlagFeedbackSerializerTestCase, self).setUp()
+        self.channel = testdata.channel("testchannel")
+        self.flagged_node = testdata.node(
+            {
+                "kind_id": content_kinds.VIDEO,
+                "title": "Suspicious Video content",
+            },
+        )
+
+    def _create_base_feedback_data(self, context, contentnode_id, content_id):
+        base_feedback_data = {
+            'context': context,
+            'contentnode_id': contentnode_id,
+            'content_id': content_id,
+        }
+        return base_feedback_data
+
+    def test_deserialization_and_validation(self):
+        data = {
+            'user': self.user.id,
+            'target_channel_id': str(self.channel.id),
+            'context': {'test_key': 'test_value'},
+            'contentnode_id': str(self.flagged_node.id),
+            'content_id': str(self.flagged_node.content_id),
+            'feedback_type': 'FLAGGED',
+            'feedback_reason': 'Reason1.....'
+        }
+        serializer = FlagFeedbackEventSerializer(data=data)
+        self.assertTrue(serializer.is_valid(), serializer.errors)
+        instance = serializer.save()
+        self.assertEqual(instance.context, data['context'])
+        self.assertEqual(instance.user.id, data['user'])
+        self.assertEqual(instance.feedback_type, data['feedback_type'])
+        self.assertEqual(instance.feedback_reason, data['feedback_reason'])
+
+    def test_invalid_data(self):
+        data = {'context': 'invalid'}
+        serializer = FlagFeedbackEventSerializer(data=data)
+        self.assertFalse(serializer.is_valid())
diff --git a/contentcuration/contentcuration/tests/test_settings.py b/contentcuration/contentcuration/tests/test_settings.py
index 25bbc71a54..48b1b39db6 100644
--- a/contentcuration/contentcuration/tests/test_settings.py
+++ b/contentcuration/contentcuration/tests/test_settings.py
@@ -37,7 +37,7 @@ def test_delete_account_invalid(self):
         try:
             DeleteAccountView.as_view()(request)
             self.assertTrue(False)
-        except UserWarning:
+        except Exception:
             self.assertTrue(User.objects.filter(email=self.user.email).exists())
 
     def test_delete_account(self):
diff --git a/contentcuration/contentcuration/tests/testdata.py b/contentcuration/contentcuration/tests/testdata.py
index 57a3b50b5d..bbae770ef1 100644
--- a/contentcuration/contentcuration/tests/testdata.py
+++ b/contentcuration/contentcuration/tests/testdata.py
@@ -101,13 +101,13 @@ def fileobj_video(contents=None):
 def node_json(data):
     node_data = {
         "title": "Recipes",
-        "node_id": "acedacedacedacedacedacedacedaced",
+        "node_id": data.get("node_id", "acedacedacedacedacedacedacedaced"),
         "content_id": "aa480b60a7f4526f886e7df9f4e9b8cc",
         "description": "Recipes for various dishes.",
         "author": "Bradley Smoker",
         "kind": data['kind'],
         "license": data['license'],
-        "extra_fields": "",
+        "extra_fields": {},
         "files": [],
         "questions": []
     }
@@ -230,12 +230,15 @@ def random_string(chars=10):
     return ''.join(random.choice(string.ascii_uppercase + string.digits) for _ in range(chars))
 
 
-def user(email='user@test.com'):
+def user(email='user@test.com', feature_flags=None):
     user, is_new = cc.User.objects.get_or_create(email=email)
     if is_new:
         user.set_password('password')
         user.is_active = True
         user.save()
+    if feature_flags is not None:
+        user.feature_flags = feature_flags
+        user.save()
     return user
 
 
diff --git a/contentcuration/contentcuration/tests/views/test_users.py b/contentcuration/contentcuration/tests/views/test_users.py
index e79e0cdbf9..5247bf46b7 100644
--- a/contentcuration/contentcuration/tests/views/test_users.py
+++ b/contentcuration/contentcuration/tests/views/test_users.py
@@ -2,14 +2,17 @@
 
 from django.http.response import HttpResponseBadRequest
 from django.http.response import HttpResponseForbidden
+from django.http.response import HttpResponseNotAllowed
 from django.http.response import HttpResponseRedirectBase
+from django.urls import reverse_lazy
 from mock import mock
 
+from contentcuration.models import User
 from contentcuration.tests import testdata
+from contentcuration.tests.base import BaseAPITestCase
 from contentcuration.tests.base import StudioAPITestCase
 from contentcuration.views.users import login
 from contentcuration.views.users import UserActivationView
-from contentcuration.views.users import UserRegistrationView
 
 
 class LoginTestCase(StudioAPITestCase):
@@ -107,32 +110,46 @@ def test_after_delete__no_login(self):
             djangologin.assert_not_called()
 
 
-class UserRegistrationViewTestCase(StudioAPITestCase):
+class UserRegistrationViewTestCase(BaseAPITestCase):
     def setUp(self):
         super(UserRegistrationViewTestCase, self).setUp()
-        self.view = UserRegistrationView()
-        self.request = mock.Mock()
-        self.request.body = json.dumps(dict(
+        User.objects.filter(email="tester@tester.com").delete()
+        self.view = reverse_lazy("register")
+        self.request_data = dict(
             first_name="Tester",
             last_name="Tester",
             email="tester@tester.com",
-            pasword1="tester",
-            pasword2="tester",
+            pasword1="tester123",
+            pasword2="tester123",
             uses="IDK",
             source="IDK",
             policies=json.dumps(dict(policy_etc=True)),
             locations="IDK",
-        ))
+        )
 
     def test_post__no_duplicate_registration(self):
         testdata.user(email="tester@tester.com")
-        response = self.view.post(self.request)
+        response = self.post(self.view, self.request_data)
         self.assertIsInstance(response, HttpResponseForbidden)
 
-    def test_after_delete__no_registration(self):
+    def test_post__inactive_registration(self):
+        user = testdata.user(email="tester@tester.com")
+        user.is_active = False
+        user.save()
+        response = self.post(self.view, self.request_data)
+        self.assertIsInstance(response, HttpResponseNotAllowed)
+
+    def test_post__password_too_short(self):
+        self.request_data["pasword1"] = "123"
+        self.request_data["pasword2"] = "123"
+        response = self.post(self.view, self.request_data)
+        self.assertIsInstance(response, HttpResponseBadRequest)
+        self.assertIn("password1", response.content.decode())
+
+    def test_post__after_delete(self):
         user = testdata.user(email="tester@tester.com")
         user.delete()
-        response = self.view.post(self.request)
+        response = self.post(self.view, self.request_data)
         self.assertIsInstance(response, HttpResponseForbidden)
 
 
diff --git a/contentcuration/contentcuration/tests/viewsets/base.py b/contentcuration/contentcuration/tests/viewsets/base.py
index f02ff3c4d1..97f5cb52f7 100644
--- a/contentcuration/contentcuration/tests/viewsets/base.py
+++ b/contentcuration/contentcuration/tests/viewsets/base.py
@@ -12,7 +12,9 @@
 from contentcuration.viewsets.sync.utils import generate_create_event as base_generate_create_event
 from contentcuration.viewsets.sync.utils import generate_delete_event as base_generate_delete_event
 from contentcuration.viewsets.sync.utils import generate_deploy_event as base_generate_deploy_event
+from contentcuration.viewsets.sync.utils import generate_publish_event as base_generate_publish_event
 from contentcuration.viewsets.sync.utils import generate_update_event as base_generate_update_event
+from contentcuration.viewsets.sync.utils import generate_update_descendants_event as base_generate_update_descendants_event
 
 
 def generate_copy_event(*args, **kwargs):
@@ -54,6 +56,16 @@ def generate_deploy_channel_event(channel_id, user_id):
     event["rev"] = random.randint(1, 10000000)
     return event
 
+def generate_update_descendants_event(*args, **kwargs):
+    event = base_generate_update_descendants_event(*args, **kwargs)
+    event["rev"] = random.randint(1, 10000000)
+    return event
+
+def generate_publish_channel_event(channel_id):
+    event = base_generate_publish_event(channel_id)
+    event["rev"] = random.randint(1, 10000000)
+    return event
+
 
 class SyncTestMixin(object):
     celery_task_always_eager = None
diff --git a/contentcuration/contentcuration/tests/viewsets/test_channel.py b/contentcuration/contentcuration/tests/viewsets/test_channel.py
index 505fbd836b..17549ab128 100644
--- a/contentcuration/contentcuration/tests/viewsets/test_channel.py
+++ b/contentcuration/contentcuration/tests/viewsets/test_channel.py
@@ -3,20 +3,26 @@
 import uuid
 
 import mock
+from django.db.models import Exists
+from django.db.models import OuterRef
 from django.urls import reverse
+from kolibri_public.models import ContentNode as PublicContentNode
 from le_utils.constants import content_kinds
 
 from contentcuration import models
 from contentcuration import models as cc
 from contentcuration.constants import channel_history
+from contentcuration.models import ContentNode
 from contentcuration.tests import testdata
 from contentcuration.tests.base import StudioAPITestCase
 from contentcuration.tests.viewsets.base import generate_create_event
 from contentcuration.tests.viewsets.base import generate_delete_event
 from contentcuration.tests.viewsets.base import generate_deploy_channel_event
+from contentcuration.tests.viewsets.base import generate_publish_channel_event
 from contentcuration.tests.viewsets.base import generate_sync_channel_event
 from contentcuration.tests.viewsets.base import generate_update_event
 from contentcuration.tests.viewsets.base import SyncTestMixin
+from contentcuration.viewsets.channel import _unpublished_changes_query
 from contentcuration.viewsets.sync.constants import CHANNEL
 
 
@@ -374,6 +380,19 @@ def test_deploy_with_staging_tree_None(self):
         self.assertNotEqual(modified_channel.main_tree, channel.staging_tree)
         self.assertNotEqual(modified_channel.previous_tree, channel.main_tree)
 
+    def test_publish_does_not_make_publishable(self):
+        user = testdata.user()
+        channel = models.Channel.objects.create(actor_id=user.id, **self.channel_metadata)
+        channel.editors.add(user)
+
+        self.sync_changes(
+            [
+                generate_publish_channel_event(channel.id)
+            ]
+        )
+
+        self.assertEqual(_unpublished_changes_query(channel).count(), 0)
+
 
 class CRUDTestCase(StudioAPITestCase):
     @property
@@ -466,3 +485,224 @@ def test_admin_restore_channel(self):
         channel = models.Channel.objects.get(id=channel.id)
         self.assertFalse(channel.deleted)
         self.assertEqual(1, channel.history.filter(actor=user, action=channel_history.RECOVERY).count())
+
+
+class UnpublishedChangesQueryTestCase(StudioAPITestCase):
+    def test_unpublished_changes_query_with_channel_object(self):
+        channel = testdata.channel()
+        user = testdata.user()
+        models.Change.create_change(generate_update_event(channel.id, CHANNEL, {"name": "new name"}, channel_id=channel.id), created_by_id=user.id)
+        models.Change.create_change(generate_publish_channel_event(channel.id), created_by_id=user.id)
+        models.Change.create_change(generate_update_event(channel.id, CHANNEL, {"name": "new name 2"}, channel_id=channel.id), created_by_id=user.id)
+
+        queryset = _unpublished_changes_query(channel)
+        self.assertEqual(queryset.count(), 1)
+        self.assertEqual(queryset[0].kwargs["mods"]["name"], "new name 2")
+
+    def test_unpublished_changes_query_with_channel_object_none_since_publish(self):
+        channel = testdata.channel()
+        user = testdata.user()
+        models.Change.create_change(generate_update_event(channel.id, CHANNEL, {"name": "new name"}, channel_id=channel.id), created_by_id=user.id)
+        models.Change.create_change(generate_update_event(channel.id, CHANNEL, {"name": "new name 2"}, channel_id=channel.id), created_by_id=user.id)
+        models.Change.create_change(generate_publish_channel_event(channel.id), created_by_id=user.id)
+
+        queryset = _unpublished_changes_query(channel)
+        self.assertEqual(queryset.count(), 0)
+
+    def test_unpublished_changes_query_with_channel_object_no_publishable_since_publish(self):
+        channel = testdata.channel()
+        user = testdata.user()
+        models.Change.create_change(generate_update_event(channel.id, CHANNEL, {"name": "new name"}, channel_id=channel.id), created_by_id=user.id)
+        models.Change.create_change(generate_publish_channel_event(channel.id), created_by_id=user.id)
+        models.Change.create_change(
+            generate_update_event(
+                channel.id,
+                CHANNEL,
+                {"name": "new name 2"},
+                channel_id=channel.id
+            ),
+            created_by_id=user.id,
+            unpublishable=True,
+        )
+
+        queryset = _unpublished_changes_query(channel)
+        self.assertEqual(queryset.count(), 0)
+
+    def test_unpublished_changes_query_with_channel_object_no_publishable_since_publish_if_publish_fails_through_error(self):
+        channel = testdata.channel()
+        user = testdata.user()
+        channel.main_tree = None
+        channel.save()
+        models.Change.create_change(generate_publish_channel_event(channel.id), created_by_id=user.id)
+
+        queryset = _unpublished_changes_query(channel)
+        self.assertEqual(queryset.count(), 0)
+
+    def test_unpublished_changes_query_with_channel_object_no_publishable_since_publish_if_publish_fails_because_incomplete(self):
+        channel = testdata.channel()
+        user = testdata.user()
+        channel.main_tree.complete = False
+        channel.save()
+        models.Change.create_change(generate_publish_channel_event(channel.id), created_by_id=user.id)
+
+        queryset = _unpublished_changes_query(channel)
+        self.assertEqual(queryset.count(), 0)
+
+    def test_unpublished_changes_query_with_outerref(self):
+        channel = testdata.channel()
+        user = testdata.user()
+        models.Change.create_change(generate_update_event(channel.id, CHANNEL, {"name": "new name"}, channel_id=channel.id), created_by_id=user.id)
+        models.Change.create_change(generate_publish_channel_event(channel.id), created_by_id=user.id)
+        models.Change.create_change(generate_update_event(channel.id, CHANNEL, {"name": "new name 2"}, channel_id=channel.id), created_by_id=user.id)
+
+        outer_ref = OuterRef("id")
+        unpublished_changes = _unpublished_changes_query(outer_ref)
+        channels = models.Channel.objects.filter(pk=channel.pk).annotate(unpublished_changes=Exists(unpublished_changes))
+        self.assertTrue(channels[0].unpublished_changes)
+
+    def test_unpublished_changes_query_with_outerref_none_since_publish(self):
+        channel = testdata.channel()
+        user = testdata.user()
+        models.Change.create_change(generate_update_event(channel.id, CHANNEL, {"name": "new name"}, channel_id=channel.id), created_by_id=user.id)
+        models.Change.create_change(generate_update_event(channel.id, CHANNEL, {"name": "new name 2"}, channel_id=channel.id), created_by_id=user.id)
+        models.Change.create_change(generate_publish_channel_event(channel.id), created_by_id=user.id)
+
+        outer_ref = OuterRef("id")
+        unpublished_changes = _unpublished_changes_query(outer_ref)
+        channels = models.Channel.objects.filter(pk=channel.pk).annotate(unpublished_changes=Exists(unpublished_changes))
+        self.assertFalse(channels[0].unpublished_changes)
+
+    def test_unpublished_changes_query_with_outerref_no_publishable_since_publish(self):
+        channel = testdata.channel()
+        user = testdata.user()
+        models.Change.create_change(generate_update_event(channel.id, CHANNEL, {"name": "new name"}, channel_id=channel.id), created_by_id=user.id)
+        models.Change.create_change(generate_publish_channel_event(channel.id), created_by_id=user.id)
+        models.Change.create_change(
+            generate_update_event(
+                channel.id,
+                CHANNEL,
+                {"name": "new name 2"},
+                channel_id=channel.id
+            ),
+            created_by_id=user.id,
+            unpublishable=True
+        )
+
+        outer_ref = OuterRef("id")
+        unpublished_changes = _unpublished_changes_query(outer_ref)
+        channels = models.Channel.objects.filter(pk=channel.pk).annotate(unpublished_changes=Exists(unpublished_changes))
+        self.assertFalse(channels[0].unpublished_changes)
+
+    def test_unpublished_changes_query_no_publishable_since_publish_if_publish_fails_through_error(self):
+        channel = testdata.channel()
+        user = testdata.user()
+        channel.main_tree = None
+        channel.save()
+        models.Change.create_change(generate_publish_channel_event(channel.id), created_by_id=user.id)
+
+        outer_ref = OuterRef("id")
+        unpublished_changes = _unpublished_changes_query(outer_ref)
+        channels = models.Channel.objects.filter(pk=channel.pk).annotate(unpublished_changes=Exists(unpublished_changes))
+        self.assertFalse(channels[0].unpublished_changes)
+
+    def test_unpublished_changes_query_no_publishable_since_publish_if_publish_fails_because_incomplete(self):
+        channel = testdata.channel()
+        user = testdata.user()
+        channel.main_tree.complete = False
+        channel.save()
+        models.Change.create_change(generate_publish_channel_event(channel.id), created_by_id=user.id)
+
+        outer_ref = OuterRef("id")
+        unpublished_changes = _unpublished_changes_query(outer_ref)
+        channels = models.Channel.objects.filter(pk=channel.pk).annotate(unpublished_changes=Exists(unpublished_changes))
+        self.assertFalse(channels[0].unpublished_changes)
+
+
+class ChannelLanguageTestCase(StudioAPITestCase):
+
+    def setUp(self):
+        super(ChannelLanguageTestCase, self).setUp()
+        self.channel = testdata.channel()
+        self.channel.language_id = 'en'
+        self.channel.save()
+
+        self.channel_id = self.channel.id
+        self.node_id = '00000000000000000000000000000003'
+        self.public_node = PublicContentNode.objects.create(
+            id=uuid.UUID(self.node_id),
+            title='Video 1',
+            content_id=uuid.uuid4(),
+            channel_id=uuid.UUID(self.channel.id),
+            lang_id='en',
+        )
+
+    def test_channel_language_exists_valid_channel(self):
+
+        ContentNode.objects.filter(node_id=self.public_node.id).update(language_id='en')
+        response = self._perform_action("channel-language-exists", self.channel.id)
+        self.assertEqual(response.status_code, 200, response.content)
+        self.assertTrue(response.json()["exists"])
+
+    def test_channel_language_doesnt_exists_valid_channel(self):
+
+        PublicContentNode.objects.filter(id=self.public_node.id).update(lang_id='es')
+        response = self._perform_action("channel-language-exists", self.channel.id)
+        self.assertEqual(response.status_code, 200, response.content)
+        self.assertFalse(response.json()["exists"])
+
+    def test_channel_language_exists_invalid_channel(self):
+
+        response = self._perform_action("channel-language-exists", 'unknown_channel_id')
+        self.assertEqual(response.status_code, 404, response.content)
+
+    def test_channel_language_exists_invalid_request(self):
+
+        response = self._perform_action("channel-language-exists", None)
+        self.assertEqual(response.status_code, 404, response.content)
+
+    def test_get_languages_in_channel_success_languages(self):
+        new_language = 'swa'
+        self.channel.language_id = new_language
+        self.channel.save()
+        PublicContentNode.objects.filter(id=self.public_node.id).update(lang_id=new_language)
+        ContentNode.objects.filter(node_id=self.public_node.id).update(language_id=new_language)
+
+        response = self._perform_action("channel-languages", self.channel.id)
+        languages = response.json()["languages"]
+
+        self.assertEqual(response.status_code, 200, response.content)
+        self.assertListEqual(languages, [new_language])
+
+    def test_get_languages_in_channel_success_channel_language_excluded(self):
+        new_language = 'fr'
+        channel_lang = 'en'
+        self.channel.language_id = channel_lang
+        self.channel.save()
+        PublicContentNode.objects.filter(id=self.public_node.id).update(lang_id=new_language)
+        ContentNode.objects.filter(node_id=self.public_node.id).update(language_id=new_language)
+
+        response = self._perform_action("channel-languages", self.channel.id)
+        languages = response.json()["languages"]
+
+        self.assertEqual(response.status_code, 200, response.content)
+        self.assertListEqual(languages, [new_language])
+        self.assertFalse(channel_lang in languages)
+
+    def test_get_languages_in_channel_success_no_languages(self):
+
+        response = self._perform_action("channel-languages", self.channel.id)
+        languages = response.json()["languages"]
+
+        self.assertEqual(response.status_code, 200, response.content)
+        self.assertListEqual(languages, [])
+
+    def test_get_languages_in_channel_invalid_request(self):
+
+        response = self._perform_action("channel-languages", None)
+        self.assertEqual(response.status_code, 404, response.content)
+
+    def _perform_action(self, url_path, channel_id):
+        user = testdata.user()
+        self.client.force_authenticate(user=user)
+        response = self.client.get(reverse(url_path, kwargs={"pk": channel_id}), format="json")
+        return response
diff --git a/contentcuration/contentcuration/tests/viewsets/test_contentnode.py b/contentcuration/contentcuration/tests/viewsets/test_contentnode.py
index 98178b1601..15a39cb4cc 100644
--- a/contentcuration/contentcuration/tests/viewsets/test_contentnode.py
+++ b/contentcuration/contentcuration/tests/viewsets/test_contentnode.py
@@ -27,15 +27,17 @@
 from contentcuration.tests.viewsets.base import generate_copy_event
 from contentcuration.tests.viewsets.base import generate_create_event
 from contentcuration.tests.viewsets.base import generate_delete_event
+from contentcuration.tests.viewsets.base import generate_publish_channel_event
 from contentcuration.tests.viewsets.base import generate_update_event
+from contentcuration.tests.viewsets.base import generate_update_descendants_event
 from contentcuration.tests.viewsets.base import SyncTestMixin
 from contentcuration.utils.db_tools import TreeBuilder
+from contentcuration.viewsets.channel import _unpublished_changes_query
 from contentcuration.viewsets.contentnode import ContentNodeFilter
 from contentcuration.viewsets.sync.constants import CONTENTNODE
 from contentcuration.viewsets.sync.constants import CONTENTNODE_PREREQUISITE
 from contentcuration.viewsets.sync.constants import UPDATED
 
-
 nested_subjects = [subject for subject in SUBJECTSLIST if "." in subject]
 
 
@@ -574,6 +576,40 @@ def test_cannot_update_no_permissions(self):
             models.ContentNode.objects.get(id=contentnode.id).title, new_title
         )
 
+    def test_update_descendants_contentnode(self):
+        root_node = testdata.tree(parent=self.channel.main_tree)
+
+        descendants = root_node.get_descendants(include_self=True)
+        # Fix undefined extra_fields
+        descendants.exclude(kind_id=content_kinds.TOPIC).update(extra_fields={})
+
+        new_language = "es"
+        
+        response = self.sync_changes(
+            [generate_update_descendants_event(root_node.id, {"language": new_language}, channel_id=self.channel.id)],
+        )
+        self.assertEqual(response.status_code, 200, response.content)
+
+        descendants = root_node.get_descendants(include_self=True)
+        for descendant in descendants:
+            language = models.ContentNode.objects.get(id=descendant.id).language
+            language = str(language)
+            self.assertEqual(language, new_language)
+    
+    def test_cannot_update_descendants_when_updating_non_topic_node(self):
+        root_node = testdata.tree()
+        video_node = root_node.get_descendants().filter(kind_id=content_kinds.VIDEO).first()
+        new_language = "pt"
+        
+        response = self.sync_changes(
+            [generate_update_descendants_event(video_node.id, {"language": new_language}, channel_id=self.channel.id)],
+        )
+
+        self.assertEqual(len(response.data["errors"]), 1)
+        self.assertNotEqual(
+            models.ContentNode.objects.get(id=video_node.id).language, new_language
+        )
+    
     def test_update_contentnode_exercise_mastery_model(self):
         metadata = self.contentnode_db_metadata
         metadata["kind_id"] = content_kinds.EXERCISE
@@ -781,6 +817,47 @@ def test_update_contentnode_update_options_completion_criteria_threshold_only(se
         self.assertEqual(c.extra_fields["options"]["completion_criteria"]["model"], completion_criteria.TIME)
         self.assertEqual(c.extra_fields["options"]["completion_criteria"]["threshold"], 10)
 
+    def test_update_completion_criteria_model_to_determined_by_resource_edge_case(self):
+        metadata = self.contentnode_db_metadata
+        metadata["kind_id"] = content_kinds.HTML5
+        metadata["extra_fields"] = {
+            "options": {
+                "completion_criteria": {
+                    "model": completion_criteria.REFERENCE,
+                    "threshold": None,
+                    "learner_managed": False
+                }
+            }
+        }
+        contentnode = models.ContentNode.objects.create(**metadata)
+
+        response = self.sync_changes(
+                [
+                    generate_update_event(
+                        contentnode.id,
+                        CONTENTNODE,
+                        {
+                            "complete": True,
+                            "extra_fields.options.completion_criteria.threshold": 600,
+                            "extra_fields.options.completion_criteria.model": completion_criteria.APPROX_TIME
+                        },
+                        channel_id=self.channel.id
+                    ),
+                    generate_update_event(
+                        contentnode.id,
+                        CONTENTNODE,
+                        {
+                            "extra_fields.options.completion_criteria.model": completion_criteria.DETERMINED_BY_RESOURCE
+                        },
+                        channel_id=self.channel.id
+                    )
+                ],
+        )
+        self.assertEqual(len(response.data["errors"]), 0)
+        updated_contentnode = models.ContentNode.objects.get(id=contentnode.id)
+        self.assertEqual(updated_contentnode.extra_fields["options"]["completion_criteria"]["model"], completion_criteria.DETERMINED_BY_RESOURCE)
+        self.assertNotIn("threshold", updated_contentnode.extra_fields["options"]["completion_criteria"])
+
     def test_update_contentnode_update_options_invalid_completion_criteria(self):
         metadata = self.contentnode_db_metadata
         metadata["extra_fields"] = {
@@ -1173,6 +1250,23 @@ def test_copy_contentnode(self):
 
         self.assertEqual(new_node.parent_id, self.channel.main_tree_id)
 
+    def test_copy_contentnode_finalization_does_not_make_publishable(self):
+        self.channel.editors.add(self.user)
+        contentnode = models.ContentNode.objects.create(**self.contentnode_db_metadata)
+        new_node_id = uuid.uuid4().hex
+        response = self.sync_changes(
+            [
+                generate_copy_event(
+                    new_node_id, CONTENTNODE, contentnode.id, self.channel.main_tree_id, channel_id=self.channel.id
+                ),
+                # Save a published change for the channel, so that the finalization change will be generated
+                # after the publish change, and we can check that it is properly not making the channel appear publishable.
+                generate_publish_channel_event(self.channel.id),
+            ],
+        )
+        self.assertEqual(response.status_code, 200, response.content)
+        self.assertEqual(_unpublished_changes_query(self.channel).count(), 0)
+
     def test_cannot_copy_contentnode__source_permission(self):
         source_channel = testdata.channel()
         contentnode = create_and_get_contentnode(source_channel.main_tree_id)
diff --git a/contentcuration/contentcuration/tests/viewsets/test_flagged.py b/contentcuration/contentcuration/tests/viewsets/test_flagged.py
new file mode 100644
index 0000000000..a507c5e4e9
--- /dev/null
+++ b/contentcuration/contentcuration/tests/viewsets/test_flagged.py
@@ -0,0 +1,134 @@
+from django.urls import reverse
+from le_utils.constants import content_kinds
+
+from contentcuration.models import FlagFeedbackEvent
+from contentcuration.tests import testdata
+from contentcuration.tests.base import StudioAPITestCase
+
+
+class CRUDTestCase(StudioAPITestCase):
+    @property
+    def flag_feedback_object(self):
+        return {
+            'context': {'spam': 'Spam or misleading'},
+            'contentnode_id': self.contentNode.id,
+            'content_id': self.contentNode.content_id,
+            'target_channel_id': self.channel.id,
+            'user': self.user.id,
+            'feedback_type': 'FLAGGED',
+            'feedback_reason': 'Some reason provided by the user'
+        }
+
+    def setUp(self):
+        super(CRUDTestCase, self).setUp()
+        self.contentNode = testdata.node(
+            {
+                "kind_id": content_kinds.VIDEO,
+                "title": "Suspicious Video content",
+            },
+        )
+        self.channel = testdata.channel()
+        self.user = testdata.user(feature_flags={"test_dev_feature": True})
+
+    def test_create_flag_event(self):
+        self.client.force_authenticate(user=self.user)
+        flagged_content = self.flag_feedback_object
+        response = self.client.post(
+            reverse("flagged-list"), flagged_content, format="json",
+        )
+        self.assertEqual(response.status_code, 201, response.content)
+
+    def test_create_flag_event_fails_for_flag_test_dev_feature_disabled(self):
+        flagged_content = self.flag_feedback_object
+        self.user.feature_flags = {'test_dev_feature': False}
+        self.user.save()
+        self.client.force_authenticate(user=self.user)
+        response = self.client.post(
+            reverse("flagged-list"), flagged_content, format="json",
+        )
+        self.assertEqual(response.status_code, 403, response.content)
+
+    def test_create_flag_event_fails_for_flag_test_dev_feature_None(self):
+        flagged_content = self.flag_feedback_object
+        self.user.feature_flags = None
+        self.user.save()
+        self.client.force_authenticate(user=self.user)
+        response = self.client.post(
+            reverse("flagged-list"), flagged_content, format="json",
+        )
+        self.assertEqual(response.status_code, 403, response.content)
+
+    def test_create_flag_event_fails_for_unauthorized_user(self):
+        flagged_content = self.flag_feedback_object
+        response = self.client.post(
+            reverse("flagged-list"), flagged_content, format="json",
+        )
+        self.assertEqual(response.status_code, 403, response.content)
+
+    def test_list_flagged_content_super_admin(self):
+        self.user.is_admin = True
+        self.user.save()
+        self.client.force_authenticate(self.user)
+        response = self.client.get(reverse("flagged-list"), format="json")
+        self.assertEqual(response.status_code, 200, response.content)
+
+    def test_retreive_fails_for_normal_user(self):
+        self.client.force_authenticate(user=self.user)
+        flag_feedback_object = FlagFeedbackEvent.objects.create(
+            **{
+                'context': {'spam': 'Spam or misleading'},
+                'contentnode_id': self.contentNode.id,
+                'content_id': self.contentNode.content_id,
+                'target_channel_id': self.channel.id,
+                'feedback_type': 'FLAGGED',
+                'feedback_reason': 'Some reason provided by the user'
+            },
+            user=self.user,
+        )
+        response = self.client.get(reverse("flagged-detail", kwargs={"pk": flag_feedback_object.id}), format="json")
+        self.assertEqual(response.status_code, 403, response.content)
+
+    def test_list_fails_for_normal_user(self):
+        self.client.force_authenticate(user=self.user)
+        response = self.client.get(reverse("flagged-list"), format="json")
+        self.assertEqual(response.status_code, 403, response.content)
+
+    def test_list_fails_for_user_dev_feature_enabled(self):
+        response = self.client.get(reverse("flagged-list"), format="json")
+        self.assertEqual(response.status_code, 403, response.content)
+
+    def test_destroy_flagged_content_super_admin(self):
+        self.user.is_admin = True
+        self.user.save()
+        self.client.force_authenticate(self.user)
+        flag_feedback_object = FlagFeedbackEvent.objects.create(
+            **{
+                'context': {'spam': 'Spam or misleading'},
+                'contentnode_id': self.contentNode.id,
+                'content_id': self.contentNode.content_id,
+                'target_channel_id': self.channel.id,
+                'feedback_type': 'FLAGGED',
+                'feedback_reason': 'Some reason provided by the user'
+            },
+            user=self.user,
+        )
+        response = self.client.delete(reverse("flagged-detail", kwargs={"pk": flag_feedback_object.id}), format="json")
+        self.assertEqual(response.status_code, 204, response.content)
+
+    def test_destroy_flagged_content_fails_for_user_with_feature_flag_disabled(self):
+        self.user.feature_flags = {'test_dev_feature': False}
+        self.user.save()
+        self.client.force_authenticate(user=self.user)
+        flag_feedback_object = FlagFeedbackEvent.objects.create(
+            **{
+                'context': {'spam': 'Spam or misleading'},
+                'contentnode_id': self.contentNode.id,
+                'content_id': self.contentNode.content_id,
+                'target_channel_id': self.channel.id,
+                'feedback_type': 'FLAGGED',
+                'feedback_reason': 'Some reason provided by the user'
+            },
+            user=self.user,
+        )
+        response = self.client.delete(reverse("flagged-detail", kwargs={"pk": flag_feedback_object.id}), format="json")
+        self.assertEqual(response.status_code, 403, response.content)
diff --git a/contentcuration/contentcuration/urls.py b/contentcuration/contentcuration/urls.py
index bb03f3876e..8047ca0bf4 100644
--- a/contentcuration/contentcuration/urls.py
+++ b/contentcuration/contentcuration/urls.py
@@ -39,6 +39,7 @@
 from contentcuration.viewsets.channelset import ChannelSetViewSet
 from contentcuration.viewsets.clipboard import ClipboardViewSet
 from contentcuration.viewsets.contentnode import ContentNodeViewSet
+from contentcuration.viewsets.feedback import FlagFeedbackEventViewSet
 from contentcuration.viewsets.file import FileViewSet
 from contentcuration.viewsets.invitation import InvitationViewSet
 from contentcuration.viewsets.sync.endpoint import SyncView
@@ -67,6 +68,7 @@ def get_redirect_url(self, *args, **kwargs):
 router.register(r'assessmentitem', AssessmentItemViewSet)
 router.register(r'admin-users', AdminUserViewSet, basename='admin-users')
 router.register(r'clipboard', ClipboardViewSet, basename='clipboard')
+router.register(r'flagged', FlagFeedbackEventViewSet, basename='flagged')
 
 urlpatterns = [
     re_path(r'^api/', include(router.urls)),
diff --git a/contentcuration/contentcuration/utils/nodes.py b/contentcuration/contentcuration/utils/nodes.py
index 61491305d1..c84467a5cc 100644
--- a/contentcuration/contentcuration/utils/nodes.py
+++ b/contentcuration/contentcuration/utils/nodes.py
@@ -453,3 +453,11 @@ def migrate_extra_fields(extra_fields):
             "model": completion_criteria.MASTERY,
         }
     return extra_fields
+
+
+def validate_and_conform_to_schema_threshold_none(completion_criteria_validated):
+    model = completion_criteria_validated.get("model", {})
+    if model in ["reference", "determined_by_resource"]:
+        if "threshold" not in completion_criteria_validated or completion_criteria_validated["threshold"] is not None:
+            completion_criteria_validated["threshold"] = None
+    return completion_criteria_validated
diff --git a/contentcuration/contentcuration/utils/pagination.py b/contentcuration/contentcuration/utils/pagination.py
index d8da8699cc..2a6fb8c946 100644
--- a/contentcuration/contentcuration/utils/pagination.py
+++ b/contentcuration/contentcuration/utils/pagination.py
@@ -153,13 +153,13 @@ def paginate_queryset(self, queryset, request, view=None):
             *ordering
         )
 
-    def get_more(self):  # noqa C901
+    def _get_more_position_offset(self):
         """
         Vendored and modified from
         https://github.com/encode/django-rest-framework/blob/6ea95b6ad1bc0d4a4234a267b1ba32701878c6bb/rest_framework/pagination.py#L694
         """
         if not self.has_next:
-            return None
+            return None, None
 
         if (
             self.page
@@ -212,6 +212,13 @@ def get_more(self):  # noqa C901
         if not self.page:
             position = self.next_position
 
+        return position, offset
+
+    def get_more(self):
+        position, offset = self._get_more_position_offset()
+        if position is None and offset is None:
+            return None
+
         tokens = {}
         if offset != 0:
             tokens["o"] = str(offset)
diff --git a/contentcuration/contentcuration/views/internal.py b/contentcuration/contentcuration/views/internal.py
index 32733d7d4e..13eba6376f 100644
--- a/contentcuration/contentcuration/views/internal.py
+++ b/contentcuration/contentcuration/views/internal.py
@@ -236,7 +236,8 @@ def api_commit_channel(request):
             channel_id=channel_id,
         )
         # Send event (new staging tree or new main tree) for the channel
-        Change.create_change(event, created_by_id=request.user.id)
+        # mark is as unpublishable, as by itself a new staging tree is not a publishable change
+        Change.create_change(event, created_by_id=request.user.id, unpublishable=True)
 
         # Mark old staging tree for garbage collection
         if old_staging and old_staging != obj.main_tree:
diff --git a/contentcuration/contentcuration/views/users.py b/contentcuration/contentcuration/views/users.py
index 71328971a6..ecf5d85ac3 100644
--- a/contentcuration/contentcuration/views/users.py
+++ b/contentcuration/contentcuration/views/users.py
@@ -14,6 +14,7 @@
 from django.http import HttpResponse
 from django.http import HttpResponseBadRequest
 from django.http import HttpResponseForbidden
+from django.http import HttpResponseNotAllowed
 from django.shortcuts import redirect
 from django.template.loader import render_to_string
 from django.urls import reverse_lazy
@@ -112,6 +113,7 @@ def deferred_user_space_by_kind(request):
         }
     )
 
+
 @api_view(["GET"])
 @authentication_classes((SessionAuthentication,))
 @permission_classes((IsAuthenticated,))
@@ -160,36 +162,26 @@ class UserRegistrationView(RegistrationView):
     template_name = "registration/registration_information_form.html"
     http_method_names = ["post"]
 
-    def post(self, request):
-        data = json.loads(request.body)
-        form = self.form_class(data)
-        try:
-            # Registration is valid or user hasn't set account up (invitation workflow)
-            if form.is_valid():
-                self.register(form)
-                return HttpResponse()
-
-            # Legacy handle invitations where users haven't activated their accounts
-            inactive_user = User.get_for_email(data['email'], is_active=False, password='')
-            if inactive_user:
-                form.errors.clear()
-                user = form.save(commit=False)
-                inactive_user.set_password(form.cleaned_data["password1"])
-                inactive_user.first_name = user.first_name
-                inactive_user.last_name = user.last_name
-                inactive_user.information = user.information
-                inactive_user.policies = user.policies
-                inactive_user.save()
-                self.send_activation_email(inactive_user)
-                return HttpResponse()
-
-            if form._errors["email"]:
-                return HttpResponseBadRequest(
-                    status=405, reason="Account hasn't been activated"
-                )
-            return HttpResponseBadRequest()
-        except UserWarning:
-            return HttpResponseForbidden()
+    def get_form_kwargs(self):
+        kwargs = super(UserRegistrationView, self).get_form_kwargs()
+        # override the form data with the json data
+        kwargs["data"] = json.loads(self.request.body)
+        return kwargs
+
+    def form_valid(self, form):
+        self.register(form)
+        return HttpResponse()
+
+    def form_invalid(self, form):
+        # frontend handles the error messages
+        error_response = json.dumps(list(form.errors.keys()))
+
+        if form.has_error("email", code=form.CODE_ACCOUNT_ACTIVE):
+            return HttpResponseForbidden(error_response)
+        elif form.has_error("email", code=form.CODE_ACCOUNT_INACTIVE):
+            return HttpResponseNotAllowed(error_response)
+
+        return HttpResponseBadRequest(error_response)
 
     def send_activation_email(self, user):
         activation_key = self.get_activation_key(user)
diff --git a/contentcuration/contentcuration/viewsets/base.py b/contentcuration/contentcuration/viewsets/base.py
index 38eb177064..161588a675 100644
--- a/contentcuration/contentcuration/viewsets/base.py
+++ b/contentcuration/contentcuration/viewsets/base.py
@@ -967,7 +967,8 @@ def update_progress(progress=None):
             custom_task_metadata_object.save()
 
     Change.create_change(
-        generate_update_event(pk, table, {TASK_ID: task_object.task_id}, channel_id=channel_id), applied=True
+        # These changes are purely for ephemeral progress updating, and do not constitute a publishable change.
+        generate_update_event(pk, table, {TASK_ID: task_object.task_id}, channel_id=channel_id), applied=True, unpublishable=True
     )
 
     tracker = ProgressTracker(task_id, update_progress)
@@ -982,8 +983,9 @@ def update_progress(progress=None):
     finally:
         if task_object.status == states.STARTED:
             # No error reported, cleanup.
+            # Mark as unpublishable, as this is a continuation of the progress updating, and not a publishable change.
             Change.create_change(
-                generate_update_event(pk, table, {TASK_ID: None}, channel_id=channel_id), applied=True
+                generate_update_event(pk, table, {TASK_ID: None}, channel_id=channel_id), applied=True, unpublishable=True
             )
             task_object.delete()
             custom_task_metadata_object.delete()
diff --git a/contentcuration/contentcuration/viewsets/channel.py b/contentcuration/contentcuration/viewsets/channel.py
index fdd9c99cd8..796f7999e8 100644
--- a/contentcuration/contentcuration/viewsets/channel.py
+++ b/contentcuration/contentcuration/viewsets/channel.py
@@ -1,23 +1,35 @@
 import logging
+import uuid
 from functools import reduce
 from operator import or_
+from typing import Dict
+from typing import List
+from typing import Union
 
 from django.conf import settings
 from django.db import IntegrityError
 from django.db.models import Exists
+from django.db.models import F
 from django.db.models import OuterRef
 from django.db.models import Q
 from django.db.models import Subquery
+from django.db.models import UUIDField
 from django.db.models import Value
+from django.db.models.functions import Cast
 from django.db.models.functions import Coalesce
+from django.http import HttpResponse
+from django.http import HttpResponseNotFound
+from django.http import JsonResponse
 from django.utils.decorators import method_decorator
 from django.views.decorators.cache import cache_page
 from django_cte import With
 from django_filters.rest_framework import BooleanFilter
 from django_filters.rest_framework import CharFilter
+from kolibri_public.models import ContentNode as PublicContentNode
 from le_utils.constants import content_kinds
 from le_utils.constants import roles
 from rest_framework import serializers
+from rest_framework.decorators import action
 from rest_framework.exceptions import ValidationError
 from rest_framework.permissions import AllowAny
 from rest_framework.permissions import IsAuthenticated
@@ -85,7 +97,6 @@ class CatalogListPagination(CachedListPagination):
     .order_by("-token")[:1]
 )
 
-
 base_channel_filter_fields = (
     "keywords",
     "published",
@@ -135,9 +146,11 @@ def filter_keywords(self, queryset, name, value):
         dash_replaced_search_query = get_fts_search_query(value.replace("-", ""))
 
         channel_keywords_query = (Exists(ChannelFullTextSearch.objects.filter(
-            Q(keywords_tsvector=search_query) | Q(keywords_tsvector=dash_replaced_search_query), channel_id=OuterRef("id"))))
+            Q(keywords_tsvector=search_query) | Q(keywords_tsvector=dash_replaced_search_query),
+            channel_id=OuterRef("id"))))
         contentnode_search_query = (Exists(ContentNodeFullTextSearch.objects.filter(
-            Q(keywords_tsvector=search_query) | Q(author_tsvector=search_query), channel_id=OuterRef("id"))))
+            Q(keywords_tsvector=search_query) | Q(author_tsvector=search_query),
+            channel_id=OuterRef("id"))))
 
         return queryset.filter(Q(channel_keywords_query) | Q(contentnode_search_query))
 
@@ -397,10 +410,12 @@ def _unpublished_changes_query(channel):
             change_type=PUBLISHED,
             errored=False
         ).values("server_rev").order_by("-server_rev")[:1], Value(0)),
-        created_by__isnull=False,
         channel=channel,
-        user__isnull=True
-    )
+        # Going forwards, these changes will be marked as unpublishable,
+        # but leave these filters here for now for backwards compatibility
+        created_by__isnull=False,
+        user__isnull=True,
+    ).exclude(unpublishable=True)
 
 
 class ChannelViewSet(ValuesViewset):
@@ -425,7 +440,9 @@ def create(self, request, *args, **kwargs):
         except IntegrityError as e:
             return Response({"error": str(e)}, status=409)
         instance = serializer.instance
-        Change.create_change(generate_create_event(instance.id, CHANNEL, request.data, channel_id=instance.id), applied=True, created_by_id=request.user.id)
+        Change.create_change(
+            generate_create_event(instance.id, CHANNEL, request.data, channel_id=instance.id),
+            applied=True, created_by_id=request.user.id)
         return Response(self.serialize_object(pk=instance.pk), status=HTTP_201_CREATED)
 
     def destroy(self, request, *args, **kwargs):
@@ -478,7 +495,8 @@ def annotate_queryset(self, queryset):
             count=SQCount(non_topic_content_ids, field="content_id"),
         )
 
-        queryset = queryset.annotate(unpublished_changes=Exists(_unpublished_changes_query(OuterRef("id"))))
+        queryset = queryset.annotate(
+            unpublished_changes=Exists(_unpublished_changes_query(OuterRef("id"))))
 
         return queryset
 
@@ -488,7 +506,8 @@ def publish_from_changes(self, changes):
             # Publish change will have key, version_notes, and language.
             try:
                 self.publish(
-                    publish["key"], version_notes=publish.get("version_notes"), language=publish.get("language")
+                    publish["key"], version_notes=publish.get("version_notes"),
+                    language=publish.get("language")
                 )
             except Exception as e:
                 log_sync_exception(e, user=self.request.user, change=publish)
@@ -508,7 +527,8 @@ def publish(self, pk, version_notes="", language=None):
 
         channel.mark_publishing(self.request.user)
 
-        with create_change_tracker(pk, CHANNEL, channel.id, self.request.user, "export-channel") as progress_tracker:
+        with create_change_tracker(pk, CHANNEL, channel.id, self.request.user,
+                                   "export-channel") as progress_tracker:
             try:
                 channel = publish_channel(
                     self.request.user.pk,
@@ -528,20 +548,21 @@ def publish(self, pk, version_notes="", language=None):
                             "unpublished_changes": _unpublished_changes_query(channel).exists()
                         }, channel_id=channel.id
                     ),
-                ], applied=True)
+                ], applied=True, unpublishable=True)
             except ChannelIncompleteError:
                 Change.create_changes([
                     generate_update_event(
                         channel.id, CHANNEL, {"publishing": False}, channel_id=channel.id
                     ),
-                ], applied=True)
+                ], applied=True, unpublishable=True)
                 raise ValidationError("Channel is not ready to be published")
             except Exception:
                 Change.create_changes([
                     generate_update_event(
-                        channel.id, CHANNEL, {"publishing": False, "unpublished_changes": True}, channel_id=channel.id
+                        channel.id, CHANNEL, {"publishing": False, "unpublished_changes": True},
+                        channel_id=channel.id
                     ),
-                ], applied=True)
+                ], applied=True, unpublishable=True)
                 raise
 
     def sync_from_changes(self, changes):
@@ -562,7 +583,8 @@ def sync_from_changes(self, changes):
                 errors.append(sync)
         return errors
 
-    def sync(self, pk, titles_and_descriptions=False, resource_details=False, files=False, assessment_items=False):
+    def sync(self, pk, titles_and_descriptions=False, resource_details=False, files=False,
+             assessment_items=False):
         logging.debug("Entering the sync channel endpoint")
 
         channel = self.get_edit_queryset().get(pk=pk)
@@ -572,18 +594,19 @@ def sync(self, pk, titles_and_descriptions=False, resource_details=False, files=
 
         if (
             not channel.main_tree.get_descendants()
-            .filter(
+                .filter(
                 Q(original_node__isnull=False)
                 | Q(
                     original_channel_id__isnull=False,
                     original_source_node_id__isnull=False,
                 )
             )
-            .exists()
+                .exists()
         ):
             raise ValidationError("Cannot sync a channel with no imported content")
 
-        with create_change_tracker(pk, CHANNEL, channel.id, self.request.user, "sync-channel") as progress_tracker:
+        with create_change_tracker(pk, CHANNEL, channel.id, self.request.user,
+                                   "sync-channel") as progress_tracker:
             sync_channel(
                 channel,
                 titles_and_descriptions,
@@ -639,6 +662,108 @@ def deploy(self, user, pk):
             channel_id=channel.id,
         ), applied=True, created_by_id=user.id)
 
+    @action(detail=True, methods=["get"], url_path='language_exists', url_name='language-exists')
+    def channel_language_exists(self, request, pk=None) -> Union[JsonResponse, HttpResponse]:
+        """
+        Verify that the language set for a channel is present in at least one of its resources.
+
+        :param request: The request object
+        :param pk: The ID of the channel
+        :return: JsonResponse with exists=True if the language exists, False otherwise
+        :rtype: JsonResponse
+        """
+        if not self._channel_exists(pk):
+            return HttpResponseNotFound("No channel matching: {}".format(pk))
+
+        channel_lang, main_tree_id = self._get_channel_details(pk).values()
+        langs_in_channel = self._get_channel_content_languages(pk, main_tree_id)
+        lang_exists = channel_lang in langs_in_channel
+
+        return JsonResponse({"exists": lang_exists})
+
+    @action(detail=True, methods=["get"], url_path='languages', url_name='languages')
+    def get_languages_in_channel(self, request, pk=None) -> Union[JsonResponse, HttpResponse]:
+        """
+        Get all the languages present in a channel's resources.
+
+        :param request: The request object
+        :param pk: The ID of the channel
+        :return: JsonResponse with a list of languages present in the channel
+        :rtype: JsonResponse
+        """
+        if not self._channel_exists(pk):
+            return HttpResponseNotFound("No channel matching: {}".format(pk))
+
+        channel_details = self._get_channel_details(pk)
+        main_tree_id = channel_details.get("main_tree_id")
+        langs_in_content = self._get_channel_content_languages(pk, main_tree_id)
+        return JsonResponse({"languages": langs_in_content})
+
+    def _channel_exists(self, channel_id) -> bool:
+        """
+        Check if a channel exists.
+
+        :param channel_id: The ID of the channel
+        :return: True if the channel exists, False otherwise
+        :rtype: bool
+        """
+        try:
+            return Channel.objects.filter(pk=channel_id).exists()
+        except Exception as e:
+            logging.error(f"Error checking if channel exists: {e}")
+            return False
+
+    def _get_channel_details(self, channel_id) -> Dict[str, any]:
+        """
+        Get the language set for a channel.
+
+        :param channel_id: The ID of the channel
+        :return: The language code set for the channel
+        :rtype: str
+        """
+        try:
+            channel_details = (Channel.objects.filter(pk=channel_id)
+                               .values("language_id", "main_tree_id").first())
+        except Channel.DoesNotExist as e:
+            logging.error(str(e))
+            channel_details = None
+
+        if not channel_details:
+            channel_details = dict(language_id=None, main_tree_id=None)
+
+        return channel_details
+
+    def _get_channel_content_languages(self, channel_id, main_tree_id=None) -> List[str]:
+        """
+        Get all the languages used in a channel's resources.
+
+        :param channel_id: The ID of the channel
+        :return: A list of language codes used in the channel
+        :rtype: List[str]
+        """
+        if not channel_id:
+            return []
+
+        try:
+            ids_to_exclude = [main_tree_id] if main_tree_id else []
+            node_ids_subquery = PublicContentNode.objects.filter(
+                channel_id=uuid.UUID(channel_id),
+            ).values_list("id", flat=True)
+            lang_ids = ContentNode.objects.filter(
+                language_id__isnull=False
+            ).annotate(
+                cast_node_id=Cast(F('node_id'), output_field=UUIDField())
+            ).filter(
+                cast_node_id__in=Subquery(node_ids_subquery)
+            ).exclude(
+                id__in=ids_to_exclude
+            ).values_list('language_id', flat=True).distinct()
+            unique_lang_ids = list(set(lang_ids))
+        except Exception as e:
+            logging.error(str(e))
+            unique_lang_ids = []
+        return unique_lang_ids
+
 
 @method_decorator(
     cache_page(
@@ -708,7 +833,7 @@ def filter_keywords(self, queryset, name, value):
         editors_first_name = reduce(or_, (Q(editors__first_name__icontains=k) for k in keywords))
         editors_last_name = reduce(or_, (Q(editors__last_name__icontains=k) for k in keywords))
         editors_email = reduce(or_, (Q(editors__email__icontains=k) for k in keywords))
-        return queryset.annotate(primary_token=primary_token_subquery,).filter(
+        return queryset.annotate(primary_token=primary_token_subquery, ).filter(
             Q(name__icontains=value)
             | Q(pk__istartswith=value)
             | Q(primary_token=value.replace("-", ""))
@@ -725,6 +850,7 @@ class AdminChannelSerializer(ChannelSerializer):
     This is a write only serializer - we leverage it to do create and update
     operations, but read operations are handled by the Viewset.
     """
+
     class Meta:
         model = Channel
         fields = (
@@ -783,7 +909,9 @@ def update(self, request, *args, **kwargs):
         serializer.is_valid(raise_exception=True)
         self.perform_update(serializer)
 
-        Change.create_change(generate_update_event(instance.id, CHANNEL, request.data, channel_id=instance.id), applied=True, created_by_id=request.user.id)
+        Change.create_change(
+            generate_update_event(instance.id, CHANNEL, request.data, channel_id=instance.id),
+            applied=True, created_by_id=request.user.id)
 
         return Response(self.serialize_object())
 
diff --git a/contentcuration/contentcuration/viewsets/contentnode.py b/contentcuration/contentcuration/viewsets/contentnode.py
index 591eccdcd9..b92c66ddd6 100644
--- a/contentcuration/contentcuration/viewsets/contentnode.py
+++ b/contentcuration/contentcuration/viewsets/contentnode.py
@@ -29,6 +29,8 @@
 from le_utils.constants.labels import resource_type
 from le_utils.constants.labels import subjects
 from rest_framework.decorators import action
+from rest_framework.pagination import Cursor
+from rest_framework.pagination import replace_query_param
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
 from rest_framework.serializers import BooleanField
@@ -55,6 +57,8 @@
 from contentcuration.tasks import calculate_resource_size_task
 from contentcuration.utils.nodes import calculate_resource_size
 from contentcuration.utils.nodes import migrate_extra_fields
+from contentcuration.utils.pagination import ValuesViewsetCursorPagination
+from contentcuration.utils.nodes import validate_and_conform_to_schema_threshold_none
 from contentcuration.viewsets.base import BulkListSerializer
 from contentcuration.viewsets.base import BulkModelSerializer
 from contentcuration.viewsets.base import BulkUpdateMixin
@@ -278,6 +282,10 @@ class CompletionCriteriaSerializer(JSONFieldDictSerializer):
     model = CharField()
     learner_managed = BooleanField(required=False, allow_null=True)
 
+    def update(self, instance, validated_data):
+        validated_data = validate_and_conform_to_schema_threshold_none(validated_data)
+        return super(CompletionCriteriaSerializer, self).update(instance, validated_data)
+
 
 class ExtraFieldsOptionsSerializer(JSONFieldDictSerializer):
     modality = ChoiceField(choices=(("QUIZ", "Quiz"),), allow_null=True, required=False)
@@ -651,12 +659,56 @@ def dict_if_none(obj, field_name=None):
     return obj[field_name] if field_name in obj and obj[field_name] else {}
 
 
+class ContentNodePagination(ValuesViewsetCursorPagination):
+    """
+    A simplified cursor pagination class for ContentNodeViewSet.
+    Instead of using an opaque cursor, it uses the lft value for filtering.
+    As such, if this pagination scheme is used without applying a filter
+    that will guarantee membership to a specific MPTT tree, such as parent
+    or tree_id, the pagination scheme will not be predictable.
+    """
+    cursor_query_param = "lft__gt"
+    ordering = "lft"
+    page_size_query_param = "max_results"
+    max_page_size = 100
+
+    def decode_cursor(self, request):
+        """
+        Given a request with a cursor, return a `Cursor` instance.
+        """
+        # Determine if we have a cursor, and if so then decode it.
+        value = request.query_params.get(self.cursor_query_param)
+        if value is None:
+            return None
+
+        return Cursor(offset=0, reverse=False, position=value)
+
+    def encode_cursor(self, cursor):
+        """
+        Given a Cursor instance, return an url with query parameter.
+        """
+        return replace_query_param(self.base_url, self.cursor_query_param, str(cursor.position))
+
+    def get_more(self):
+        position, offset = self._get_more_position_offset()
+        if position is None and offset is None:
+            return None
+        params = self.request.query_params.copy()
+        params.update({
+            self.cursor_query_param: position,
+        })
+        return params
+
+
 # Apply mixin first to override ValuesViewset
 class ContentNodeViewSet(BulkUpdateMixin, ValuesViewset):
     queryset = ContentNode.objects.all()
     serializer_class = ContentNodeSerializer
     permission_classes = [IsAuthenticated]
     filterset_class = ContentNodeFilter
+    pagination_class = ContentNodePagination
+    # This must exactly match the ordering on the pagination class defined above.
+    ordering = ["lft"]
     values = (
         "id",
         "content_id",
@@ -992,6 +1044,8 @@ def copy(
                 ),
                 applied=True,
                 created_by_id=self.request.user.id,
+                # This is not a publishable change, as it is just updating ephemeral status updates.
+                unpublishable=True,
             )
 
     def perform_create(self, serializer, change=None):
@@ -1009,3 +1063,29 @@ def perform_create(self, serializer, change=None):
                 created_by_id=change["created_by_id"],
                 applied=True
             )
+
+    def update_descendants(self, pk, mods):
+        """ Update a node and all of its descendants with the given mods """
+        root = ContentNode.objects.get(id=pk)
+
+        if root.kind_id != content_kinds.TOPIC:
+            raise ValidationError("Only topics can have descendants to update")
+
+        descendantsIds = root.get_descendants(include_self=True).values_list("id", flat=True)
+
+        changes = [{ "key": descendantId, "mods": mods } for descendantId in descendantsIds]
+
+        return self.update_from_changes(changes) # Bulk update
+
+    def update_descendants_from_changes(self, changes):
+        errors = []
+        for change in changes:
+            try:
+                change_errors = self.update_descendants(change["key"], change["mods"])
+                errors += change_errors
+            except Exception as e:
+                log_sync_exception(e, user=self.request.user, change=change)
+                change["errors"] = [str(e)]
+                errors.append(change)
+        print("errorsv", errors)
+        return errors
diff --git a/contentcuration/contentcuration/viewsets/feedback.py b/contentcuration/contentcuration/viewsets/feedback.py
new file mode 100644
index 0000000000..7044da4bd8
--- /dev/null
+++ b/contentcuration/contentcuration/viewsets/feedback.py
@@ -0,0 +1,54 @@
+from rest_framework import permissions
+from rest_framework import serializers
+from rest_framework import viewsets
+from rest_framework.permissions import IsAuthenticated
+
+from contentcuration.models import FlagFeedbackEvent
+
+
+class IsAdminForListAndDestroy(permissions.BasePermission):
+    def _check_admin_or_feature_flag(self, request, view):
+        # only allow list and destroy of flagged content to admins
+        if view.action in ['list', 'destroy', 'retrieve']:
+            try:
+                return request.user and request.user.is_admin
+            except AttributeError:
+                return False
+        if request.user.check_feature_flag('test_dev_feature'):
+            return True
+        return False
+
+    def has_permission(self, request, view):
+        return self._check_admin_or_feature_flag(request, view)
+
+    def has_object_permission(self, request, view, obj):
+        return self._check_admin_or_feature_flag(request, view)
+
+
+class BaseFeedbackSerializer(serializers.ModelSerializer):
+    class Meta:
+        fields = ['id', 'context', 'contentnode_id', 'content_id']
+        read_only_fields = ['id']
+
+
+class BaseFeedbackEventSerializer(serializers.ModelSerializer):
+    class Meta:
+        fields = ['user', 'target_channel_id']
+        read_only_fields = ['user']
+
+
+class BaseFeedbackInteractionEventSerializer(serializers.ModelSerializer):
+    class Meta:
+        fields = ['feedback_type', 'feedback_reason']
+
+
+class FlagFeedbackEventSerializer(BaseFeedbackSerializer, BaseFeedbackEventSerializer, BaseFeedbackInteractionEventSerializer):
+    class Meta:
+        model = FlagFeedbackEvent
+        fields = BaseFeedbackSerializer.Meta.fields + BaseFeedbackEventSerializer.Meta.fields + BaseFeedbackInteractionEventSerializer.Meta.fields
+
+
+class FlagFeedbackEventViewSet(viewsets.ModelViewSet):
+    queryset = FlagFeedbackEvent.objects.all()
+    serializer_class = FlagFeedbackEventSerializer
+    permission_classes = [IsAuthenticated, IsAdminForListAndDestroy]
diff --git a/contentcuration/contentcuration/viewsets/sync/base.py b/contentcuration/contentcuration/viewsets/sync/base.py
index f11a8f4729..0a0e515bf0 100644
--- a/contentcuration/contentcuration/viewsets/sync/base.py
+++ b/contentcuration/contentcuration/viewsets/sync/base.py
@@ -23,6 +23,7 @@
 from contentcuration.viewsets.sync.constants import CREATED
 from contentcuration.viewsets.sync.constants import DELETED
 from contentcuration.viewsets.sync.constants import DEPLOYED
+from contentcuration.viewsets.sync.constants import UPDATED_DESCENDANTS
 from contentcuration.viewsets.sync.constants import EDITOR_M2M
 from contentcuration.viewsets.sync.constants import FILE
 from contentcuration.viewsets.sync.constants import INVITATION
@@ -94,6 +95,7 @@ def get_change_type(obj):
     PUBLISHED: "publish_from_changes",
     SYNCED: "sync_from_changes",
     DEPLOYED: "deploy_from_changes",
+    UPDATED_DESCENDANTS: "update_descendants_from_changes",
 }
 
 
diff --git a/contentcuration/contentcuration/viewsets/sync/constants.py b/contentcuration/contentcuration/viewsets/sync/constants.py
index ace4ebaf7b..0f208813a1 100644
--- a/contentcuration/contentcuration/viewsets/sync/constants.py
+++ b/contentcuration/contentcuration/viewsets/sync/constants.py
@@ -7,6 +7,7 @@
 PUBLISHED = 6
 SYNCED = 7
 DEPLOYED = 8
+UPDATED_DESCENDANTS = 9
 
 
 ALL_CHANGES = set([
@@ -18,6 +19,7 @@
     PUBLISHED,
     SYNCED,
     DEPLOYED,
+    UPDATED_DESCENDANTS,
 ])
 
 # Client-side table constants
@@ -54,6 +56,18 @@
     ]
 )
 
+# Some edits have implications for channels,
+# but do not affect whether a channel is publishable or not
+# only edits to these tables are considered publishable changes
+# although individual changes can still be marked as unpublishable.
+PUBLISHABLE_CHANGE_TABLES = set([
+    CHANNEL,
+    CONTENTNODE,
+    CONTENTNODE_PREREQUISITE,
+    ASSESSMENTITEM,
+    FILE,
+])
+
 
 # Enum for copying states
 class COPYING_STATUS_VALUES:
diff --git a/contentcuration/contentcuration/viewsets/sync/utils.py b/contentcuration/contentcuration/viewsets/sync/utils.py
index f86b9685d8..e47552735f 100644
--- a/contentcuration/contentcuration/viewsets/sync/utils.py
+++ b/contentcuration/contentcuration/viewsets/sync/utils.py
@@ -5,6 +5,7 @@
 from contentcuration.utils.sentry import report_exception
 from contentcuration.viewsets.sync.constants import ALL_TABLES
 from contentcuration.viewsets.sync.constants import CHANNEL
+from contentcuration.viewsets.sync.constants import CONTENTNODE
 from contentcuration.viewsets.sync.constants import COPIED
 from contentcuration.viewsets.sync.constants import CREATED
 from contentcuration.viewsets.sync.constants import DELETED
@@ -12,6 +13,7 @@
 from contentcuration.viewsets.sync.constants import MOVED
 from contentcuration.viewsets.sync.constants import PUBLISHED
 from contentcuration.viewsets.sync.constants import UPDATED
+from contentcuration.viewsets.sync.constants import UPDATED_DESCENDANTS
 
 
 def validate_table(table):
@@ -81,6 +83,10 @@ def generate_deploy_event(key, user_id):
     event = _generate_event(key, CHANNEL, DEPLOYED, channel_id=key, user_id=user_id)
     return event
 
+def generate_update_descendants_event(key, mods, channel_id=None, user_id=None):
+    event = _generate_event(key, CONTENTNODE, UPDATED_DESCENDANTS, channel_id, user_id)
+    event["mods"] = mods
+    return event
 
 def log_sync_exception(e, user=None, change=None, changes=None):
     # Capture exception and report, but allow sync
diff --git a/package.json b/package.json
index b162d9d8de..48358d2f44 100644
--- a/package.json
+++ b/package.json
@@ -56,6 +56,7 @@
   "dependencies": {
     "@sentry/vue": "^7.112.2",
     "@toast-ui/editor": "^2.3.1",
+    "@vue/composition-api": "^1.7.2",
     "ajv": "^8.12.0",
     "axios": "^1.7.2",
     "broadcast-channel": "^5.1.0",
diff --git a/requirements-dev.in b/requirements-dev.in
index a0d8d603dd..7a403fffcd 100644
--- a/requirements-dev.in
+++ b/requirements-dev.in
@@ -21,6 +21,6 @@ drf-yasg==1.21.5
 pyinstrument
 pypandoc
 git+https://github.com/someshchaturvedi/customizable-django-profiler.git#customizable-django-profiler
-tabulate==0.8.2
+tabulate==0.9.0
 fonttools
 minio==7.1.1
diff --git a/requirements-dev.txt b/requirements-dev.txt
index da776d23d6..206a049a46 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -230,7 +230,7 @@ sqlparse==0.4.1
     #   -c requirements.txt
     #   django
     #   django-debug-toolbar
-tabulate==0.8.2
+tabulate==0.9.0
     # via -r requirements-dev.in
 tblib==1.7.0
     # via django-concurrent-test-helper
diff --git a/requirements.txt b/requirements.txt
index 1a6006a876..09dce49a93 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -218,7 +218,7 @@ rsa==4.7.2
     # via google-auth
 s3transfer==0.4.2
     # via boto3
-sentry-sdk==1.16.0
+sentry-sdk==2.12.0
     # via -r requirements.in
 six==1.16.0
     # via
diff --git a/yarn.lock b/yarn.lock
index 4c60d4f9d8..f2b81fc552 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3042,7 +3042,7 @@
   optionalDependencies:
     prettier "^1.18.2 || ^2.0.0"
 
-"@vue/composition-api@1.7.2":
+"@vue/composition-api@1.7.2", "@vue/composition-api@^1.7.2":
   version "1.7.2"
   resolved "https://registry.yarnpkg.com/@vue/composition-api/-/composition-api-1.7.2.tgz#0b656f3ec39fefc2cf40aaa8c12426bcfeae1b44"
   integrity sha512-M8jm9J/laYrYT02665HkZ5l2fWTK4dcVg3BsDHm/pfz+MjDYwX+9FUaZyGwEyXEDonQYRCo0H7aLgdklcIELjw==