diff --git a/contentcuration/contentcuration/frontend/accounts/pages/Create.vue b/contentcuration/contentcuration/frontend/accounts/pages/Create.vue
index 4d14afd77b..361ffce01d 100644
--- a/contentcuration/contentcuration/frontend/accounts/pages/Create.vue
+++ b/contentcuration/contentcuration/frontend/accounts/pages/Create.vue
@@ -99,15 +99,20 @@
         <h1 class="font-weight-bold my-2 subheading">
           {{ $tr('sourceLabel') }}*
         </h1>
-        <VSelect
-          v-model="form.source"
-          :items="sourceOptions"
-          item-text="label"
-          item-value="id"
-          box
-          menu-props="offsetY"
-          :label="$tr('sourcePlaceholder')"
-        />
+        <DropdownWrapper>
+          <template #default="{ attach, menuProps }">
+            <VSelect
+              v-model="form.source"
+              :items="sourceOptions"
+              item-text="label"
+              item-value="id"
+              box
+              :menu-props="menuProps"
+              :attach="attach"
+              :label="$tr('sourcePlaceholder')"
+            />
+          </template>
+        </DropdownWrapper>
         <VSlideYTransition>
           <TextArea
             v-if="form.source === sources.ORGANIZATION"
@@ -185,10 +190,12 @@
   import Banner from 'shared/views/Banner';
   import Checkbox from 'shared/views/form/Checkbox';
   import { policies } from 'shared/constants';
+  import DropdownWrapper from 'shared/views/form/DropdownWrapper';
 
   export default {
     name: 'Create',
     components: {
+      DropdownWrapper,
       ImmersiveModalLayout,
       TextField,
       EmailField,
diff --git a/contentcuration/contentcuration/frontend/administration/components/ClipboardChip.vue b/contentcuration/contentcuration/frontend/administration/components/ClipboardChip.vue
index 47a4ad0154..957ecdaf90 100644
--- a/contentcuration/contentcuration/frontend/administration/components/ClipboardChip.vue
+++ b/contentcuration/contentcuration/frontend/administration/components/ClipboardChip.vue
@@ -6,7 +6,14 @@
         {{ value }}
       </div>
     </VChip>
-    <VBtn icon small right data-test="copy" @click="copyToClipboard">
+    <VBtn
+      v-if="clipboardAvailable"
+      icon
+      small
+      right
+      data-test="copy"
+      @click="copyToClipboard"
+    >
       <Icon small>
         content_copy
       </Icon>
@@ -30,11 +37,18 @@
         type: String,
       },
     },
+    computed: {
+      clipboardAvailable() {
+        return Boolean(navigator.clipboard);
+      },
+    },
     methods: {
       copyToClipboard() {
-        navigator.clipboard.writeText(this.value).then(() => {
-          this.$store.dispatch('showSnackbarSimple', this.successMessage);
-        });
+        if (this.clipboardAvailable) {
+          navigator.clipboard.writeText(this.value).then(() => {
+            this.$store.dispatch('showSnackbarSimple', this.successMessage);
+          });
+        }
       },
     },
   };
diff --git a/contentcuration/contentcuration/frontend/administration/components/__tests__/clipboardChip.spec.js b/contentcuration/contentcuration/frontend/administration/components/__tests__/clipboardChip.spec.js
index 6aae663d9c..a696e950c4 100644
--- a/contentcuration/contentcuration/frontend/administration/components/__tests__/clipboardChip.spec.js
+++ b/contentcuration/contentcuration/frontend/administration/components/__tests__/clipboardChip.spec.js
@@ -12,8 +12,14 @@ function makeWrapper() {
 describe('clipboardChip', () => {
   let wrapper;
   beforeEach(() => {
+    navigator.clipboard = {
+      writeText: jest.fn(),
+    };
     wrapper = makeWrapper();
   });
+  afterEach(() => {
+    delete navigator.clipboard;
+  });
   it('should fire a copy operation on button click', () => {
     const copyToClipboard = jest.fn();
     wrapper.setMethods({ copyToClipboard });
diff --git a/contentcuration/contentcuration/frontend/administration/pages/Users/UserStorage.vue b/contentcuration/contentcuration/frontend/administration/pages/Users/UserStorage.vue
index cae4e56e52..2eabcf3f27 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Users/UserStorage.vue
+++ b/contentcuration/contentcuration/frontend/administration/pages/Users/UserStorage.vue
@@ -16,17 +16,20 @@
           :rules="spaceRules"
         />
       </VFlex>
-      <VFlex style="max-width: 75px;">
-        <VSelect
-          v-model="unit"
-          :items="unitOptions"
-          :menuProps="{ offsetY: true }"
-          box
-          single-line
-          required
-          :rules="unitRules"
-        />
-      </VFlex>
+      <DropdownWrapper component="VFlex" style="max-width: 75px;">
+        <template #default="{ attach, menuProps }">
+          <VSelect
+            v-model="unit"
+            :items="unitOptions"
+            :attach="attach"
+            :menuProps="menuProps"
+            box
+            single-line
+            required
+            :rules="unitRules"
+          />
+        </template>
+      </DropdownWrapper>
     </VLayout>
     <VBtn
       v-if="showCancel"
@@ -55,6 +58,7 @@
   import { mapActions } from 'vuex';
   import findLastKey from 'lodash/findLastKey';
   import { ONE_B, ONE_KB, ONE_MB, ONE_GB, ONE_TB } from 'shared/constants';
+  import DropdownWrapper from 'shared/views/form/DropdownWrapper';
 
   const units = {
     ONE_B,
@@ -66,6 +70,7 @@
 
   export default {
     name: 'UserStorage',
+    components: { DropdownWrapper },
     props: {
       value: {
         type: Number,
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemEditor/AssessmentItemEditor.vue b/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemEditor/AssessmentItemEditor.vue
index cd2c7a0a46..7c6c31b286 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemEditor/AssessmentItemEditor.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemEditor/AssessmentItemEditor.vue
@@ -3,18 +3,21 @@
   <Uploader ref="uploader" :presetID="imagePreset">
     <template #default="{ handleFiles }">
       <VLayout>
-        <VFlex xs7 lg5>
-          <VSelect
-            :key="kindSelectKey"
-            :items="kindSelectItems"
-            :value="kind"
-            :label="$tr('questionTypeLabel')"
-            data-test="kindSelect"
-            :menu-props="{ offsetY: true }"
-            box
-            @input="onKindUpdate"
-          />
-        </VFlex>
+        <DropdownWrapper component="VFlex" xs7 lg5>
+          <template #default="{ attach, menuProps }">
+            <VSelect
+              :key="kindSelectKey"
+              :items="kindSelectItems"
+              :value="kind"
+              :label="$tr('questionTypeLabel')"
+              data-test="kindSelect"
+              :menu-props="menuProps"
+              :attach="attach"
+              box
+              @input="onKindUpdate"
+            />
+          </template>
+        </DropdownWrapper>
       </VLayout>
 
       <VLayout>
@@ -115,10 +118,12 @@
   import MarkdownEditor from 'shared/views/MarkdownEditor/MarkdownEditor/MarkdownEditor';
   import MarkdownViewer from 'shared/views/MarkdownEditor/MarkdownViewer/MarkdownViewer';
   import { FormatPresetsNames } from 'shared/leUtils/FormatPresets';
+  import DropdownWrapper from 'shared/views/form/DropdownWrapper';
 
   export default {
     name: 'AssessmentItemEditor',
     components: {
+      DropdownWrapper,
       ErrorList,
       MarkdownEditor,
       MarkdownViewer,
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeListItem/index.vue b/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeListItem/index.vue
index 29dc6cdea9..e2e5823209 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeListItem/index.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeListItem/index.vue
@@ -331,8 +331,15 @@
         return null;
       },
       levels(level) {
-        const match = Object.keys(ContentLevel).find(key => ContentLevel[key] === level);
+        let match = Object.keys(ContentLevel).find(key => ContentLevel[key] === level);
         if (match) {
+          if (match === 'PROFESSIONAL') {
+            match = 'specializedProfessionalTraining';
+          } else if (match === 'WORK_SKILLS') {
+            match = 'allLevelsWorkSkills';
+          } else if (match === 'BASIC_SKILLS') {
+            match = 'allLevelsBasicSkills';
+          }
           return this.translateMetadataString(camelCase(match));
         }
         return null;
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeOptions.vue b/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeOptions.vue
index 1752e71b49..1a4fea2eda 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeOptions.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeOptions.vue
@@ -38,7 +38,7 @@
 <script>
 
   import { mapActions, mapGetters } from 'vuex';
-  import { RouteNames } from '../constants';
+  import { RouteNames, TabNames } from '../constants';
   import MoveModal from './move/MoveModal';
   import { ContentNode } from 'shared/data/resources';
   import { withChangeTracker } from 'shared/data/changes';
@@ -119,6 +119,7 @@
             params: {
               ...this.$route.params,
               detailNodeIds: newId,
+              tab: TabNames.DETAILS,
             },
           });
         });
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/ResourcePanel.vue b/contentcuration/contentcuration/frontend/channelEdit/components/ResourcePanel.vue
index b9b4cf55d6..e651764293 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/ResourcePanel.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/ResourcePanel.vue
@@ -593,7 +593,21 @@
           .sort()
           .filter(k => ids.includes(ContentLevel[k]));
         if (matches && matches.length > 0) {
-          return this.metadataListText(matches);
+          let mappedMatches = [];
+          let newMatch;
+          matches.map(match => {
+            if (match === 'PROFESSIONAL') {
+              newMatch = 'specializedProfessionalTraining';
+            } else if (match === 'WORK_SKILLS') {
+              newMatch = 'allLevelsWorkSkills';
+            } else if (match === 'BASIC_SKILLS') {
+              newMatch = 'allLevelsBasicSkills';
+            } else {
+              newMatch = match;
+            }
+            mappedMatches.push(newMatch);
+          });
+          return this.metadataListText(mappedMatches);
         } else {
           return '-';
         }
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/AccessibilityOptions.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/AccessibilityOptions.vue
index a24b2f5484..f54648c0cb 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/AccessibilityOptions.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/AccessibilityOptions.vue
@@ -12,7 +12,7 @@
           :value="accessibilityItem.value"
           :label="accessibilityItem.label"
           color="primary"
-          :data-test="`checkbox-${accessibilityItem.label}`"
+          :data-test="`checkbox-${accessibilityItem.help}`"
         >
           <template #label>
             <span class="text-xs-left">{{ accessibilityItem.label }}</span>
@@ -22,7 +22,7 @@
               :text="$tr(accessibilityItem.help)"
               bottom
               class="px-2"
-              :data-test="`tooltip-${accessibilityItem.label}`"
+              :data-test="`tooltip-${accessibilityItem.help}`"
             />
           </template>
         </Checkbox>
@@ -89,11 +89,11 @@
       /**
        * Strings for the help tooltips
        */
-      altText: `Alternative text is provided for visual content (e.g., via the HTML alt attribute).`,
-      audioDescription: `Audio descriptions are available (e.g., via an HTML5 track element with kind="descriptions")`,
-      highContrast: `Content meets the visual contrast threshold set out in WCAG Success Criteria 1.4.6`,
-      signLanguage: `Synchronized sign language intepretation is available for audio and video content.`,
-      taggedPdf: `The structures in a PDF have been tagged to improve the navigation of the content.`,
+      altText: `Visual elements in the resource have descriptions that can be accessed by screen readers for the benefit of blind learners`,
+      audioDescription: `The resource contains a second narration audio track that provides additional information for the benefit of blind users and those with low vision`,
+      highContrast: `The resource text and visual elements are displayed with high contrast for the benefit of users with low vision`,
+      signLanguage: `Synchronized sign language intepretation is available for audio and video content`,
+      taggedPdf: `The document contains PDF tags that can be accessed by screen readers for the benefit of blind learners`,
       /* eslint-enable kolibri/vue-no-unused-translations */
     },
   };
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/ActivityDuration.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/ActivityDuration.vue
index 2313f898a7..2209dda4ac 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/ActivityDuration.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/ActivityDuration.vue
@@ -10,19 +10,22 @@
       </VFlex>
       <VFlex
         v-else-if="selectedDuration === 'shortActivity' || selectedDuration === 'longActivity'"
-        class="activity-duration-container"
         md3
         sm3
       >
-        <VAutocomplete
-          v-model.number="minutes"
-          :step="increments"
-          box
-          :label="$tr('minutesRequired')"
-          :items="availableNumbers"
-          :menu-props="{ offsetY: true, lazy: true, zIndex: 4 }"
-          attach=".activity-duration-container"
-        />
+        <DropdownWrapper>
+          <template #default="{ attach, menuProps }">
+            <VAutocomplete
+              v-model.number="minutes"
+              :step="increments"
+              box
+              :label="$tr('minutesRequired')"
+              :items="availableNumbers"
+              :menu-props="menuProps"
+              :attach="attach"
+            />
+          </template>
+        </DropdownWrapper>
       </VFlex>
       <VFlex v-else md3 sm3>
         <VTextField
@@ -58,6 +61,7 @@
     getActivityDurationValidators,
     translateValidator,
   } from 'shared/utils/validation';
+  import DropdownWrapper from 'shared/views/form/DropdownWrapper';
 
   const SHORT_MIN = 1;
   const SHORT_MAX = 30;
@@ -70,6 +74,7 @@
 
   export default {
     name: 'ActivityDuration',
+    components: { DropdownWrapper },
     props: {
       selectedDuration: {
         type: String,
@@ -183,19 +188,15 @@
     $trs: {
       minutesRequired: 'Minutes',
       optionalLabel:
-        '(Optional) Duration until resource is marked as complete. This value will not be shown to learners.',
+        '(Optional) Time required for the resource to be marked as completed. This value will not be displayed to learners.',
       notOptionalLabel:
-        'Duration until resource is marked as complete. This value will not be shown to learners.',
+        'Time required for the resource to be marked as completed. This value will not be displayed to learners.',
     },
   };
 
 </script>
 <style lang="less" scoped>
 
-  .activity-duration-container {
-    position: relative;
-  }
-
   .defaultUpload {
     margin: 0.8em;
     font-size: 1.2em;
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/CategoryOptions.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/CategoryOptions.vue
index 0acc5221c8..6d0490ef2c 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/CategoryOptions.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/CategoryOptions.vue
@@ -1,61 +1,66 @@
 <template>
 
-  <div class="category-container">
-    <VAutocomplete
-      :value="selected"
-      :items="categoriesList"
-      :searchInput.sync="categoryText"
-      :label="translateMetadataString('category')"
-      box
-      clearable
-      chips
-      deletableChips
-      multiple
-      item-value="value"
-      item-text="text"
-      :menu-props="{ offsetY: true, lazy: true, zIndex: 4 }"
-      attach=".category-container"
-      @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 }">
-        <div style="width: 100%; height: 100%">
-          <VDivider v-if="!item.value.includes('.')" />
-          <KCheckbox
-            :checked="dropdownSelected[item.value]"
-            :label="item.text"
-            :value="item.value"
-            style="margin-top: 10px"
-            :style="treeItemStyle(item)"
-            :ripple="false"
-            @change="checked => checked ? add(item.value) : remove(item.value)"
-          />
-        </div>
-      </template>
-    </VAutocomplete>
-  </div>
+  <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>
 
@@ -64,6 +69,7 @@
   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 = {};
@@ -121,6 +127,7 @@
 
   export default {
     name: 'CategoryOptions',
+    components: { DropdownWrapper },
     mixins: [constantsTranslationMixin, metadataTranslationMixin],
     props: {
       value: {
@@ -143,19 +150,6 @@
           };
         });
       },
-      dropdownSelected() {
-        const obj = {};
-        for (let category of this.selected) {
-          const paths = category.split('.');
-          let cat = '';
-          for (let path of paths) {
-            cat += path;
-            obj[cat] = true;
-            cat += '.';
-          }
-        }
-        return obj;
-      },
       selected: {
         get() {
           return this.value;
@@ -167,16 +161,19 @@
       nested() {
         return !this.categoryText;
       },
+      isSelected() {
+        return value => this.selected.some(v => v.startsWith(value));
+      },
     },
     methods: {
       treeItemStyle(item) {
         return this.nested ? { paddingLeft: `${item.level * 24}px` } : {};
       },
-      add(item) {
-        this.selected = [...this.selected, item];
+      add(value) {
+        this.selected = [...this.selected, value];
       },
-      remove(item) {
-        this.selected = this.selected.filter(i => !i.startsWith(item));
+      remove(value) {
+        this.selected = this.selected.filter(i => !i.startsWith(value));
       },
       removeAll() {
         this.selected = [];
@@ -216,16 +213,8 @@
 </script>
 <style lang="less" scoped>
 
-  .category-container {
-    position: relative;
-  }
-
-  /deep/ .v-list__tile {
-    flex-wrap: wrap;
-  }
-
-  /deep/ div[role='listitem']:first-child hr {
-    display: none;
+  .parentOption:not(:first-child) {
+    border-top: 1px solid rgba(0, 0, 0, 0.12);
   }
 
 </style>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/CompletionOptions.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/CompletionOptions.vue
index a137bb0eab..ac29517121 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/CompletionOptions.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/CompletionOptions.vue
@@ -2,22 +2,24 @@
 
   <div>
     <!-- Layout when practice quizzes are enabled -->
-    <VLayout v-if="hideCompletionDropdown" xs6 md6>
+    <VLayout xs6 md6>
       <!-- "Completion" dropdown menu  -->
-      <VFlex v-if="!audioVideoResource" xs6 md6 class="completion-container pr-2">
-        <VSelect
-          ref="completion"
-          v-model="completionDropdown"
-          box
-          :items="showCorrectCompletionOptions"
-          :label="translateMetadataString('completion')"
-          :required="required"
-          :rules="completionRules"
-          :menu-props="{ offsetY: true, lazy: true, zIndex: 4 }"
-          attach=".completion-container"
-          @focus="trackClick('Completion')"
-        />
-      </VFlex>
+      <DropdownWrapper component="VFlex" xs6 md6 class="pr-2">
+        <template #default="{ attach, menuProps }">
+          <VSelect
+            ref="completion"
+            v-model="completionDropdown"
+            box
+            :items="showCorrectCompletionOptions"
+            :label="translateMetadataString('completion')"
+            :required="required"
+            :rules="completionRules"
+            :menu-props="menuProps"
+            :attach="attach"
+            @focus="trackClick('Completion')"
+          />
+        </template>
+      </DropdownWrapper>
       <VFlex>
         <MasteryCriteriaGoal
           v-if="showMasteryCriteriaGoalDropdown"
@@ -30,20 +32,6 @@
       </VFlex>
     </VLayout>
 
-    <!-- Layout when practice quizzes are NOT enabled -->
-    <VLayout v-else xs6 md6>
-      <VFlex xs6 md6 class="pr-2">
-        <MasteryCriteriaGoal
-          v-if="kind === 'exercise'"
-          ref="mastery_model"
-          v-model="goal"
-          :placeholder="getPlaceholder('mastery_model')"
-          :required="isUnique(mastery_model)"
-          @focus="trackClick('Mastery model')"
-        />
-      </VFlex>
-    </VLayout>
-
     <VLayout>
       <MasteryCriteriaMofNFields
         v-if="kind === 'exercise'"
@@ -60,21 +48,23 @@
     </VLayout>
 
     <VLayout row wrap>
-      <VFlex xs6 md6 class="completion-duration-container pr-2">
-        <VSelect
-          v-if="!hideDurationDropdown"
-          ref="duration"
-          v-model="durationDropdown"
-          box
-          :items="selectableDurationOptions"
-          :label="translateMetadataString('duration')"
-          :required="required"
-          :rules="durationRules"
-          :menu-props="{ offsetY: true, lazy: true, zIndex: 4 }"
-          attach=".completion-duration-container"
-          @focus="trackClick('Duration')"
-        />
-      </VFlex>
+      <DropdownWrapper component="VFlex" xs6 md6 class="pr-2">
+        <template #default="{ attach, menuProps }">
+          <VSelect
+            v-if="!hideDurationDropdown"
+            ref="duration"
+            v-model="durationDropdown"
+            box
+            :items="selectableDurationOptions"
+            :label="translateMetadataString('duration')"
+            :required="required"
+            :rules="durationRules"
+            :menu-props="{ ...menuProps, zIndex: 4 }"
+            :attach="attach"
+            @focus="trackClick('Duration')"
+          />
+        </template>
+      </DropdownWrapper>
 
       <!-- "Activity duration" minutes input -->
       <VFlex xs6 md6>
@@ -117,6 +107,7 @@
     translateValidator,
   } from 'shared/utils/validation';
   import { metadataStrings, metadataTranslationMixin } from 'shared/mixins';
+  import DropdownWrapper from 'shared/views/form/DropdownWrapper';
 
   const DEFAULT_SHORT_ACTIVITY = 600;
   const DEFAULT_LONG_ACTIVITY = 3000;
@@ -132,6 +123,7 @@
   export default {
     name: 'CompletionOptions',
     components: {
+      DropdownWrapper,
       ActivityDuration,
       MasteryCriteriaMofNFields,
       MasteryCriteriaGoal,
@@ -151,10 +143,6 @@
         type: Boolean,
         default: true,
       },
-      practiceQuizzesAllowed: {
-        type: Boolean,
-        default: true,
-      },
       value: {
         type: Object,
         required: false,
@@ -163,7 +151,6 @@
     },
     data() {
       return {
-        disabledReference: ['reference'],
         // required state because we need to know the durationDropdown before it is set in backend
         currentDurationDropdown: null,
         // required state because we need to know the completion to determine durationDropdown model
@@ -184,13 +171,6 @@
         }
         return false;
       },
-      hideCompletionDropdown() {
-        /*
-          This condition can be removed once practice quizzes are fully implemented in 0.16
-          Named "hide" instead of "show" because "show" is the default behavior
-          */
-        return this.practiceQuizzesAllowed;
-      },
       audioVideoResource() {
         return this.kind === ContentKindsNames.AUDIO || this.kind === ContentKindsNames.VIDEO;
       },
@@ -201,11 +181,9 @@
             return true;
           }
           return (
-            (this.currentCompletionDropdown === CompletionDropdownMap.reference &&
-              !this.audioVideoResource) ||
+            this.currentCompletionDropdown === CompletionDropdownMap.reference ||
             (this.value.model === CompletionCriteriaModels.REFERENCE &&
-              !this.currentCompletionDropdown &&
-              !this.audioVideoResource) ||
+              !this.currentCompletionDropdown) ||
             //should be hidden if model is reference and we're getting this from the BE
             this.currentCompletionDropdown === CompletionDropdownMap.determinedByResource
           );
@@ -339,6 +317,12 @@
                 model: CompletionCriteriaModels.PAGES,
                 threshold: '100%',
               };
+            } else if (value === CompletionDropdownMap.reference) {
+              update.suggested_duration_type = null;
+              update.completion_criteria = {
+                model: CompletionCriteriaModels.REFERENCE,
+                threshold: null,
+              };
             } else {
               update.suggested_duration_type = this.value.suggested_duration_type;
               update.suggested_duration = this.value.suggested_duration;
@@ -716,13 +700,22 @@
       },
       showCorrectCompletionOptions() {
         const CompletionOptionsDropdownMap = {
-          document: [CompletionDropdownMap.allContent, CompletionDropdownMap.completeDuration],
+          document: [
+            CompletionDropdownMap.allContent,
+            CompletionDropdownMap.completeDuration,
+            CompletionDropdownMap.reference,
+          ],
           exercise: [CompletionDropdownMap.goal, CompletionDropdownMap.practiceQuiz],
           html5: [
             CompletionDropdownMap.completeDuration,
             CompletionDropdownMap.determinedByResource,
+            CompletionDropdownMap.reference,
+          ],
+          h5p: [
+            CompletionDropdownMap.determinedByResource,
+            CompletionDropdownMap.completeDuration,
+            CompletionDropdownMap.reference,
           ],
-          h5p: [CompletionDropdownMap.determinedByResource, CompletionDropdownMap.completeDuration],
           audio: [CompletionDropdownMap.completeDuration, CompletionDropdownMap.reference],
           video: [CompletionDropdownMap.completeDuration, CompletionDropdownMap.reference],
         };
@@ -752,11 +745,6 @@
             value: CompletionCriteriaModels.APPROX_TIME,
             id: 'longActivity',
           },
-          {
-            text: this.translateMetadataString('readReference'),
-            value: CompletionCriteriaModels.REFERENCE,
-            id: 'reference',
-          },
         ];
       },
       /**
@@ -771,15 +759,12 @@
           return this.allPossibleDurationOptions.map(model => ({
             value: model.id,
             text: model.text,
-            disabled: this.disabledReference.includes(model.value),
           }));
         } else if (this.kind === ContentKindsNames.EXERCISE) {
-          return this.allPossibleDurationOptions
-            .filter(model => model.value !== CompletionCriteriaModels.REFERENCE)
-            .map(model => ({
-              value: model.id,
-              text: model.text,
-            }));
+          return this.allPossibleDurationOptions.map(model => ({
+            value: model.id,
+            text: model.text,
+          }));
         } else {
           return this.allPossibleDurationOptions.map(model => ({
             value: model.id,
@@ -870,14 +855,14 @@
     },
     $trs: {
       /* eslint-disable kolibri/vue-no-unused-translations */
-      allContent: 'All content viewed',
-      completeDuration: 'Complete duration',
-      determinedByResource: 'Determined by resource',
-      goal: 'Practice until goal is met',
+      allContent: 'Viewed in its entirety',
+      completeDuration: 'When time spent is equal to duration',
+      determinedByResource: 'Determined by the resource',
+      goal: 'When goal is met',
       practiceQuiz: 'Practice quiz',
+      reference: 'Reference material',
       /* eslint-enable */
-      exactTime: 'Exact time to complete',
-      reference: 'Reference',
+      exactTime: 'Time to complete',
       referenceHint:
         'Progress will not be tracked on reference material unless learners mark it as complete',
     },
@@ -886,9 +871,4 @@
 </script>
 <style lang="less" scoped>
 
-  .completion-container,
-  .completion-duration-container {
-    position: relative;
-  }
-
 </style>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/DetailsTabView.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/DetailsTabView.vue
index aaea921f17..54b4390900 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/DetailsTabView.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/DetailsTabView.vue
@@ -57,7 +57,6 @@
             <VFlex xs12 md6 :class="{ 'pl-2': $vuetify.breakpoint.mdAndUp }">
               <!-- Learning activity -->
               <LearningActivityOptions
-                id="learning_activities"
                 ref="learning_activities"
                 v-model="contentLearningActivities"
                 :disabled="isTopic"
@@ -65,14 +64,12 @@
               />
               <!-- Level -->
               <LevelsOptions
-                id="levels"
                 ref="contentLevel"
                 v-model="contentLevel"
                 @focus="trackClick('Levels dropdown')"
               />
               <!-- What you will need -->
               <ResourcesNeededOptions
-                id="resources_needed"
                 ref="resourcesNeeded"
                 v-model="resourcesNeeded"
                 @focus="trackClick('What you will need')"
@@ -147,7 +144,6 @@
             :kind="firstNode.kind"
             :fileDuration="fileDuration"
             :required="!isDocument"
-            :practiceQuizzesAllowed="allowChannelQuizzes"
           />
         </VFlex>
       </VLayout>
@@ -178,7 +174,6 @@
           </h1>
           <!-- Language -->
           <LanguageDropdown
-            id="language"
             ref="language"
             v-model="language"
             class="mb-2"
@@ -192,13 +187,24 @@
           <!-- Visibility -->
           <VisibilityDropdown
             v-if="allResources"
-            id="role_visibility"
             ref="role_visibility"
             v-model="role"
             :placeholder="getPlaceholder('role')"
             :required="isUnique(role)"
             @focus="trackClick('Role visibility')"
           />
+
+          <!-- For Beginners -->
+          <KCheckbox
+            id="beginners"
+            ref="beginners"
+            :checked="forBeginners"
+            @change="value => forBeginners = value"
+          >
+            <span class="text-xs-left v-label" style="padding-left: 8px;">
+              {{ translateMetadataString('forBeginners') }}
+            </span>
+          </KCheckbox>
         </VFlex>
       </VLayout>
 
@@ -301,7 +307,6 @@
 
             <!-- License -->
             <LicenseDropdown
-              id="license"
               ref="license"
               v-model="licenseItem"
               :required="isUnique(license) && isUnique(license_description) && !disableAuthEdits"
@@ -387,7 +392,7 @@
   import VisibilityDropdown from 'shared/views/VisibilityDropdown';
   import Checkbox from 'shared/views/form/Checkbox';
   import { ContentKindsNames } from 'shared/leUtils/ContentKinds';
-  import { NEW_OBJECT, FeatureFlagKeys, AccessibilityCategories } from 'shared/constants';
+  import { NEW_OBJECT, AccessibilityCategories, ResourcesNeededTypes } from 'shared/constants';
   import { constantsTranslationMixin, metadataTranslationMixin } from 'shared/mixins';
 
   // Define an object to act as the place holder for non unique values.
@@ -438,8 +443,25 @@
   function generateNestedNodesGetterSetter(key) {
     return {
       get() {
-        const value = this.getValueFromNodes(key);
-        return Object.keys(value);
+        // Return the unique values...
+        return uniq(
+          // for which all selected nodes share...
+          intersection(
+            // by mapping the fields for each selected node...
+            ...this.nodes.map(node => {
+              // checking the diffTracker first, then the node...
+              for (let obj of [this.diffTracker[node.id] || {}, node]) {
+                // returning the keys of the field
+                if (Object.prototype.hasOwnProperty.call(obj, key)) {
+                  return Object.keys(obj[key]);
+                }
+              }
+              // otherwise an empty array, which will cause `intersection`
+              // to result in an empty array
+              return [];
+            })
+          )
+        );
       },
       set(value) {
         const newMap = {};
@@ -551,6 +573,20 @@
       accessibility: generateNestedNodesGetterSetter('accessibility_labels'),
       contentLevel: generateNestedNodesGetterSetter('grade_levels'),
       resourcesNeeded: generateNestedNodesGetterSetter('learner_needs'),
+      forBeginners: {
+        get() {
+          return this.resourcesNeeded.includes(ResourcesNeededTypes.FOR_BEGINNERS);
+        },
+        set(value) {
+          if (value) {
+            this.resourcesNeeded = [...this.resourcesNeeded, ResourcesNeededTypes.FOR_BEGINNERS];
+          } else {
+            this.resourcesNeeded = this.resourcesNeeded.filter(
+              r => r !== ResourcesNeededTypes.FOR_BEGINNERS
+            );
+          }
+        },
+      },
       contentLearningActivities: generateNestedNodesGetterSetter('learning_activities'),
       categories: generateNestedNodesGetterSetter('categories'),
       license() {
@@ -595,7 +631,9 @@
           };
         },
         set({ completion_criteria, suggested_duration, suggested_duration_type, modality }) {
-          completion_criteria.learner_managed = this.learnerManaged;
+          if (completion_criteria) {
+            completion_criteria.learner_managed = this.learnerManaged;
+          }
           const options = { completion_criteria, modality };
           this.updateExtraFields({ options });
           this.updateExtraFields({ suggested_duration_type });
@@ -671,9 +709,6 @@
       newContent() {
         return !this.nodes.some(n => n[NEW_OBJECT]);
       },
-      allowChannelQuizzes() {
-        return this.$store.getters.hasFeatureEnabled(FeatureFlagKeys.channel_quizzes);
-      },
       isDocument() {
         return this.firstNode.kind === ContentKindsNames.DOCUMENT;
       },
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/LearningActivityOptions.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/LearningActivityOptions.vue
index 23b9834e24..3ffd37968c 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/LearningActivityOptions.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/LearningActivityOptions.vue
@@ -1,21 +1,23 @@
 <template>
 
-  <div class="learning-activity-container">
-    <VSelect
-      v-model="learningActivity"
-      :items="learningActivities"
-      :disabled="disabled"
-      box
-      chips
-      clearable
-      :label="translateMetadataString('learningActivity')"
-      multiple
-      deletableChips
-      :menu-props="{ offsetY: true, lazy: true, zIndex: 4 }"
-      :rules="learningActivityRules"
-      :attach="$attrs.id ? `#${$attrs.id}` : '.learning-activity-container'"
-    />
-  </div>
+  <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>
 
 </template>
 
@@ -25,9 +27,11 @@
   import { LearningActivities } from 'shared/constants';
   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 },
     mixins: [constantsTranslationMixin, metadataTranslationMixin],
     props: {
       value: {
@@ -68,8 +72,4 @@
 </script>
 <style lang="less" scoped>
 
-  .learning-activity-container {
-    position: relative;
-  }
-
 </style>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/LevelsOptions.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/LevelsOptions.vue
index f3345ba5b9..9dea958af7 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/LevelsOptions.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/LevelsOptions.vue
@@ -1,20 +1,22 @@
 <template>
 
-  <div class="levels-container">
-    <VSelect
-      ref="level"
-      v-model="level"
-      :items="levels"
-      box
-      chips
-      clearable
-      :label="translateMetadataString('level')"
-      multiple
-      deletableChips
-      :menu-props="{ offsetY: true, lazy: true, zIndex: 4 }"
-      :attach="$attrs.id ? `#${$attrs.id}` : '.levels-container'"
-    />
-  </div>
+  <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>
 
 </template>
 
@@ -23,9 +25,11 @@
   import camelCase from 'lodash/camelCase';
   import { ContentLevels } from 'shared/constants';
   import { constantsTranslationMixin, metadataTranslationMixin } from 'shared/mixins';
+  import DropdownWrapper from 'shared/views/form/DropdownWrapper';
 
   export default {
     name: 'LevelsOptions',
+    components: { DropdownWrapper },
     mixins: [constantsTranslationMixin, metadataTranslationMixin],
     props: {
       value: {
@@ -71,8 +75,4 @@
 </script>
 <style lang="less" scoped>
 
-  .levels-container {
-    position: relative;
-  }
-
 </style>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/MasteryCriteriaGoal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/MasteryCriteriaGoal.vue
index 55a3295b1b..6fa3db47ee 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/MasteryCriteriaGoal.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/MasteryCriteriaGoal.vue
@@ -2,24 +2,27 @@
 
   <VFlex>
     <VLayout>
-      <VFlex>
-        <VSelect
-          ref="masteryModel"
-          v-model="masteryModel"
-          :items="masteryCriteria"
-          :label="$tr('labelText')"
-          color="primary"
-          box
-          :placeholder="placeholder"
-          :required="required"
-          :readonly="readonly"
-          :disabled="disabled"
-          :rules="masteryRules"
-          menu-props="offsetY"
-          class="mb-2"
-          @focus="$emit('focus')"
-        />
-      </VFlex>
+      <DropdownWrapper component="VFlex">
+        <template #default="{ attach, menuProps }">
+          <VSelect
+            ref="masteryModel"
+            v-model="masteryModel"
+            :items="masteryCriteria"
+            :label="$tr('labelText')"
+            color="primary"
+            box
+            :placeholder="placeholder"
+            :required="required"
+            :readonly="readonly"
+            :disabled="disabled"
+            :rules="masteryRules"
+            :menu-props="{ ...menuProps, lazy: false }"
+            :attach="attach"
+            class="mb-2"
+            @focus="$emit('focus')"
+          />
+        </template>
+      </DropdownWrapper>
     </VLayout>
   </VFlex>
 
@@ -30,9 +33,11 @@
   import { getMasteryModelValidators, translateValidator } from '../../../shared/utils/validation';
   import MasteryModels, { MasteryModelsList } from 'shared/leUtils/MasteryModels';
   import { constantsTranslationMixin } from 'shared/mixins';
+  import DropdownWrapper from 'shared/views/form/DropdownWrapper';
 
   export default {
     name: 'MasteryCriteriaGoal',
+    components: { DropdownWrapper },
     mixins: [constantsTranslationMixin],
     props: {
       value: {
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/ResourcesNeededOptions.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/ResourcesNeededOptions.vue
index e84b2b9d6d..f3262cebed 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/ResourcesNeededOptions.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/ResourcesNeededOptions.vue
@@ -1,20 +1,24 @@
 <template>
 
-  <div class="resources-needed-container">
-    <VSelect
-      ref="need"
-      v-model="need"
-      :items="resources"
-      box
-      chips
-      :label="$tr('resourcesNeededLabel')"
-      multiple
-      deletableChips
-      clearable
-      :menu-props="{ offsetY: true, lazy: true, zIndex: 4 }"
-      :attach="$attrs.id ? `#${$attrs.id}` : '.resources-needed-container'"
-    />
-  </div>
+  <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>
 
@@ -22,31 +26,20 @@
 
   import { ResourcesNeededTypes } from 'shared/constants';
   import { constantsTranslationMixin, metadataTranslationMixin } from 'shared/mixins';
+  import DropdownWrapper from 'shared/views/form/DropdownWrapper';
 
-  /**
-   * @param {array} listOfKeys
-   * @returns {Object}
-   *
-   * Determines resources to show in the dropdown, to remove resources
-   * that do not currently need to be displayed in Kolibri
-   */
-  export function updateResourcesDropdown(listOfKeys) {
-    if (listOfKeys) {
-      return Object.keys(ResourcesNeededTypes).reduce((acc, key) => {
-        if (listOfKeys.indexOf(key) === -1) {
-          acc[key] = ResourcesNeededTypes[key];
-        }
-        return acc;
-      }, {});
-    }
-  }
-
-  //the variable below can be changed or removed when metadata/Kolibri is updated
-  const keysToBeTemporarilyRemoved = ['PEERS', 'TEACHER', 'PRIOR_KNOWLEDGE', 'MATERIALS'];
-  const dropdown = updateResourcesDropdown(keysToBeTemporarilyRemoved) || ResourcesNeededTypes;
+  const dropdownItems = [
+    'PEERS',
+    'TEACHER',
+    'INTERNET',
+    'SPECIAL_SOFTWARE',
+    'PAPER_PENCIL',
+    'OTHER_SUPPLIES',
+  ];
 
   export default {
     name: 'ResourcesNeededOptions',
+    components: { DropdownWrapper },
     mixins: [constantsTranslationMixin, metadataTranslationMixin],
     props: {
       value: {
@@ -64,22 +57,25 @@
         },
       },
       resources() {
-        return Object.entries(dropdown).map(resource => ({
-          text: this.translateMetadataString(resource[0]),
-          value: resource[1],
+        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: 'What you will need',
+      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">
 
-  .resources-needed-container {
-    position: relative;
-  }
-
 </style>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/accessibilityOptions.spec.js b/contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/accessibilityOptions.spec.js
index 39b2ba83eb..050f389c6a 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/accessibilityOptions.spec.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/accessibilityOptions.spec.js
@@ -22,15 +22,11 @@ describe('AccessibilityOptions', () => {
       },
     });
 
-    expect(
-      wrapper.find('[data-test="checkbox-Has alternative text description for images"]').exists()
-    ).toBe(true);
-    expect(
-      wrapper.find('[data-test="checkbox-Has high contrast display for low vision"]').exists()
-    ).toBe(true);
-    expect(wrapper.find('[data-test="checkbox-Tagged PDF"]').exists()).toBe(true);
-    expect(wrapper.find('[data-test="checkbox-Has sign language captions"]').exists()).toBe(false);
-    expect(wrapper.find('[data-test="checkbox-Has audio descriptions"]').exists()).toBe(false);
+    expect(wrapper.find('[data-test="checkbox-altText"]').exists()).toBe(true);
+    expect(wrapper.find('[data-test="checkbox-highContrast"]').exists()).toBe(true);
+    expect(wrapper.find('[data-test="checkbox-taggedPdf"]').exists()).toBe(true);
+    expect(wrapper.find('[data-test="checkbox-signLanguage"]').exists()).toBe(false);
+    expect(wrapper.find('[data-test="checkbox-audioDescription"]').exists()).toBe(false);
   });
 
   it('should display the correct list of accessibility options if resource is a video', () => {
@@ -40,17 +36,13 @@ describe('AccessibilityOptions', () => {
       },
     });
 
-    expect(
-      wrapper.find('[data-test="checkbox-Has alternative text description for images"]').exists()
-    ).toBe(false);
-    expect(
-      wrapper.find('[data-test="checkbox-Has high contrast display for low vision"]').exists()
-    ).toBe(false);
-    expect(wrapper.find('[data-test="checkbox-Tagged PDF"]').exists()).toBe(false);
-    expect(wrapper.find('[data-test="checkbox-Has sign language captions"]').exists()).toBe(true);
-    expect(wrapper.find('[data-test="checkbox-Has audio descriptions"]').exists()).toBe(true);
-    expect(wrapper.find('[data-test="checkbox-Has captions or subtitles"]').exists()).toBe(true);
-    expect(wrapper.find('[data-test="tooltip-Has captions or subtitles"]').exists()).toBe(false);
+    expect(wrapper.find('[data-test="checkbox-altText"]').exists()).toBe(false);
+    expect(wrapper.find('[data-test="checkbox-highContrast"]').exists()).toBe(false);
+    expect(wrapper.find('[data-test="checkbox-taggedPdf"]').exists()).toBe(false);
+    expect(wrapper.find('[data-test="checkbox-signLanguage"]').exists()).toBe(true);
+    expect(wrapper.find('[data-test="checkbox-audioDescription"]').exists()).toBe(true);
+    expect(wrapper.find('[data-test="checkbox-captionsSubtitles"]').exists()).toBe(true);
+    expect(wrapper.find('[data-test="tooltip-captionsSubtitles"]').exists()).toBe(false);
   });
 
   it('should display the correct list of accessibility options if resource is an exercise/practice', () => {
@@ -60,15 +52,11 @@ describe('AccessibilityOptions', () => {
       },
     });
 
-    expect(
-      wrapper.find('[data-test="checkbox-Has alternative text description for images"]').exists()
-    ).toBe(true);
-    expect(
-      wrapper.find('[data-test="checkbox-Has high contrast display for low vision"]').exists()
-    ).toBe(false);
-    expect(wrapper.find('[data-test="checkbox-Tagged PDF"]').exists()).toBe(false);
-    expect(wrapper.find('[data-test="checkbox-Has sign language captions"]').exists()).toBe(false);
-    expect(wrapper.find('[data-test="checkbox-Has audio descriptions"]').exists()).toBe(false);
+    expect(wrapper.find('[data-test="checkbox-altText"]').exists()).toBe(true);
+    expect(wrapper.find('[data-test="checkbox-highContrast"]').exists()).toBe(false);
+    expect(wrapper.find('[data-test="checkbox-taggedPdf"]').exists()).toBe(false);
+    expect(wrapper.find('[data-test="checkbox-signLanguage"]').exists()).toBe(false);
+    expect(wrapper.find('[data-test="checkbox-audioDescription"]').exists()).toBe(false);
   });
 
   it('should display the correct list of accessibility options if resource is html5/zip', () => {
@@ -78,15 +66,11 @@ describe('AccessibilityOptions', () => {
       },
     });
 
-    expect(
-      wrapper.find('[data-test="checkbox-Has alternative text description for images"]').exists()
-    ).toBe(true);
-    expect(
-      wrapper.find('[data-test="checkbox-Has high contrast display for low vision"]').exists()
-    ).toBe(true);
-    expect(wrapper.find('[data-test="checkbox-Tagged PDF"]').exists()).toBe(false);
-    expect(wrapper.find('[data-test="checkbox-Has sign language captions"]').exists()).toBe(false);
-    expect(wrapper.find('[data-test="checkbox-Has audio descriptions"]').exists()).toBe(false);
+    expect(wrapper.find('[data-test="checkbox-altText"]').exists()).toBe(true);
+    expect(wrapper.find('[data-test="checkbox-highContrast"]').exists()).toBe(true);
+    expect(wrapper.find('[data-test="checkbox-taggedPdf"]').exists()).toBe(false);
+    expect(wrapper.find('[data-test="checkbox-signLanguage"]').exists()).toBe(false);
+    expect(wrapper.find('[data-test="checkbox-audioDescription"]').exists()).toBe(false);
   });
 
   it('should render appropriate tooltips along with the checkbox', () => {
@@ -96,23 +80,15 @@ describe('AccessibilityOptions', () => {
       },
     });
 
-    expect(
-      wrapper.find('[data-test="checkbox-Has alternative text description for images"]').exists()
-    ).toBe(true);
-    expect(
-      wrapper.find('[data-test="tooltip-Has alternative text description for images"]').exists()
-    ).toBe(true);
-    expect(
-      wrapper.find('[data-test="checkbox-Has high contrast display for low vision"]').exists()
-    ).toBe(true);
-    expect(
-      wrapper.find('[data-test="tooltip-Has high contrast display for low vision"]').exists()
-    ).toBe(true);
-    expect(wrapper.find('[data-test="checkbox-Tagged PDF"]').exists()).toBe(true);
-    expect(wrapper.find('[data-test="tooltip-Tagged PDF"]').exists()).toBe(true);
-    expect(wrapper.find('[data-test="checkbox-Has sign language captions"]').exists()).toBe(false);
-    expect(wrapper.find('[data-test="tooltip-Has sign language captions"]').exists()).toBe(false);
-    expect(wrapper.find('[data-test="checkbox-Has audio descriptions"]').exists()).toBe(false);
-    expect(wrapper.find('[data-test="tooltip-Has audio descriptions"]').exists()).toBe(false);
+    expect(wrapper.find('[data-test="checkbox-altText"]').exists()).toBe(true);
+    expect(wrapper.find('[data-test="tooltip-altText"]').exists()).toBe(true);
+    expect(wrapper.find('[data-test="checkbox-highContrast"]').exists()).toBe(true);
+    expect(wrapper.find('[data-test="tooltip-highContrast"]').exists()).toBe(true);
+    expect(wrapper.find('[data-test="checkbox-taggedPdf"]').exists()).toBe(true);
+    expect(wrapper.find('[data-test="tooltip-taggedPdf"]').exists()).toBe(true);
+    expect(wrapper.find('[data-test="checkbox-signLanguage"]').exists()).toBe(false);
+    expect(wrapper.find('[data-test="tooltip-signLanguage"]').exists()).toBe(false);
+    expect(wrapper.find('[data-test="checkbox-audioDescription"]').exists()).toBe(false);
+    expect(wrapper.find('[data-test="tooltip-audioDescription"]').exists()).toBe(false);
   });
 });
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/activityDuration.spec.js b/contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/activityDuration.spec.js
index ae2d880026..cb68ca3e26 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/activityDuration.spec.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/activityDuration.spec.js
@@ -87,9 +87,9 @@ describe('ActivityDuration', () => {
 
     describe(`hints`, () => {
       const optionalHint =
-        '(Optional) Duration until resource is marked as complete. This value will not be shown to learners.';
+        '(Optional) Time required for the resource to be marked as completed. This value will not be displayed to learners.';
       const requiredHint =
-        'Duration until resource is marked as complete. This value will not be shown to learners.';
+        'Time required for the resource to be marked as completed. This value will not be displayed to learners.';
       describe(`audio/video resource`, () => {
         it(`should display optional hint when 'Short activity' is chosen`, () => {
           const wrapper = shallowMount(ActivityDuration, {
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/completionOptions.spec.js b/contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/completionOptions.spec.js
index 178052522d..241945dffd 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/completionOptions.spec.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/completionOptions.spec.js
@@ -153,17 +153,6 @@ describe('CompletionOptions', () => {
           });
           expect(wrapper.vm.completionDropdown).toBe('goal');
         });
-        it(`Completion dropdown should not be displayed if 'practice quiz' is not enabled while 'Practice until goal is met' is set in background`, () => {
-          const wrapper = mount(CompletionOptions, {
-            propsData: {
-              kind: 'exercise',
-              value: { model: null, threshold: { m: null, n: null }, modality: 'QUIZ' },
-              practiceQuizzesAllowed: false,
-            },
-          });
-          expect(wrapper.find({ ref: 'completion' }).exists()).toBe(false);
-          expect(wrapper.vm.completionDropdown).toBe('goal');
-        });
       });
       describe(`html5 or h5p`, () => {
         it(`'Complete duration' should be displayed by default for html5`, () => {
@@ -202,7 +191,7 @@ describe('CompletionOptions', () => {
         });
       });
       describe(`audio/video`, () => {
-        it(`'Completion dropdown' is not visible and reference hint is visible when 'Reference' is selected`, () => {
+        it(`'Reference hint is visible when 'Reference' is selected`, () => {
           const wrapper = mount(CompletionOptions, {
             propsData: {
               kind: 'audio',
@@ -210,7 +199,6 @@ describe('CompletionOptions', () => {
             },
           });
           expect(wrapper.vm.showReferenceHint).toBe(true);
-          expect(wrapper.find({ ref: 'completion' }).exists()).toBe(false);
         });
       });
       describe(`exercise`, () => {
@@ -423,23 +411,6 @@ describe('CompletionOptions', () => {
           expect(wrapper.find({ ref: 'activity_duration' }).exists()).toBe(true);
           expect(wrapper.vm.showActivityDurationInput).toBe(true);
         });
-        it(`'Reference' is disabled`, async () => {
-          const wrapper = mount(CompletionOptions, {
-            propsData: {
-              kind: 'document',
-              value: { model: 'time' },
-            },
-          });
-          wrapper.find({ ref: 'completion' }).vm.$emit('input', 'completeDuration');
-          await wrapper.vm.$nextTick();
-
-          const clickableDurationDropdown = wrapper.vm.selectableDurationOptions;
-          const reference = clickableDurationDropdown.filter(
-            option => option.value === 'reference'
-          );
-          expect(clickableDurationDropdown.length).toBe(4);
-          expect(reference[0].disabled).toBe(true);
-        });
       });
       describe(`switching between 'All content viewed (ACV)' and 'Complete duration (CD)'`, () => {
         it(`Duration dropdown and minutes input stay the same when switching betweeen 'Short activity' in ACV and CD`, async () => {
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/resourcesNeededOptions.spec.js b/contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/resourcesNeededOptions.spec.js
index 28b6348ab0..0fc09b1598 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/resourcesNeededOptions.spec.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/resourcesNeededOptions.spec.js
@@ -1,8 +1,7 @@
 import Vue from 'vue';
 import Vuetify from 'vuetify';
 import { shallowMount, mount } from '@vue/test-utils';
-import ResourcesNeededOptions, { updateResourcesDropdown } from '../ResourcesNeededOptions.vue';
-import { ResourcesNeededTypes } from 'shared/constants';
+import ResourcesNeededOptions from '../ResourcesNeededOptions.vue';
 
 Vue.use(Vuetify);
 
@@ -21,22 +20,6 @@ describe('ResourcesNeededOptions', () => {
     expect(wrapper.isVueInstance()).toBe(true);
   });
 
-  it('when there is a list of keys to remove from ResourcesNeededTypes, return updated map for ResourcesNeededTypes for dropdown', () => {
-    const list = ['FOR_BEGINNERS', 'INTERNET'];
-    const numberOfAvailableResources = Object.keys(ResourcesNeededTypes).length - list.length;
-    const dropdownItemsLength = Object.keys(updateResourcesDropdown(list)).length;
-
-    expect(dropdownItemsLength).toBe(numberOfAvailableResources);
-  });
-
-  it('when there are no keys to remove from ResourcesNeededTypes, dropdown should contain all resources', () => {
-    const list = [];
-    const numberOfAvailableResources = Object.keys(ResourcesNeededTypes).length - list.length;
-    const dropdownItemsLength = Object.keys(updateResourcesDropdown(list)).length;
-
-    expect(dropdownItemsLength).toBe(numberOfAvailableResources);
-  });
-
   describe('updating state', () => {
     it('should update resources field with new values received from a parent', () => {
       const resourcesNeeded = ['person', 'book'];
@@ -53,7 +36,7 @@ describe('ResourcesNeededOptions', () => {
 
     it('should emit new input values', () => {
       const resourcesNeeded = ['person', 'book', 'train'];
-      const wrapper = makeWrapper({});
+      const wrapper = makeWrapper([]);
       const dropdown = wrapper.find({ name: 'v-select' });
       dropdown.vm.$emit('input', resourcesNeeded);
 
diff --git a/contentcuration/contentcuration/frontend/channelEdit/pages/StagingTreePage/index.vue b/contentcuration/contentcuration/frontend/channelEdit/pages/StagingTreePage/index.vue
index 30560d534c..685232138c 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/pages/StagingTreePage/index.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/pages/StagingTreePage/index.vue
@@ -520,9 +520,9 @@
       reviewMode: 'Review mode',
       emptyChannelText: 'No resources found',
       emptyChannelSubText:
-        'No changes to review! The channel contains all the latest folders and resources.',
+        'No changes to review! The channel contains all the most recent folders and resources.',
       collapseAllButton: 'Collapse all',
-      openCurrentLocationButton: 'Jump to current folder location',
+      openCurrentLocationButton: 'Expand to current folder location',
       totalResources: 'Total resources',
       totalSize: 'Total size',
       openSummaryDetailsDialogBtn: 'View summary',
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/BrowsingCard.vue b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/BrowsingCard.vue
index 5d0447df50..016ea05ff3 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/BrowsingCard.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/BrowsingCard.vue
@@ -3,7 +3,7 @@
   <VCard @click="handleClick">
     <VCardTitle>
       <VLayout row wrap>
-        <VFlex lg2 md4 sm5 xs12 class="pt-2 px-4">
+        <VFlex class="pt-2 px-4 thumbnail-column">
           <Thumbnail
             :src="node.thumbnail_src"
             :kind="node.kind"
@@ -11,7 +11,7 @@
           />
         </VFlex>
 
-        <VFlex lg10 md8 sm7 xs12 class="px-4">
+        <VFlex class="info-column px-4">
           <h3
             class="font-weight-bold mt-2 text-truncate title"
             :class="getTitleClass(node)"
@@ -198,6 +198,15 @@
 
 <style lang="less" scoped>
 
+  .thumbnail-column {
+    flex-basis: 33%;
+    max-width: 220px;
+  }
+
+  .info-column {
+    flex-basis: 67%;
+  }
+
   .show-more-btn {
     margin-left: -7px;
     text-decoration: underline;
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ChannelList.vue b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ChannelList.vue
index 43de8e8ce4..37cf667243 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ChannelList.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ChannelList.vue
@@ -3,16 +3,26 @@
   <VContainer class="mx-0 px-0">
     <!-- Filters -->
     <VLayout row wrap>
-      <VFlex sm6 md5 lg4 xl3 class="pr-4">
-        <VSelect
-          v-model="channelFilter"
-          :label="$tr('channelFilterLabel')"
-          :items="channelFilterOptions"
-          :menu-props="{ offsetY: true }"
-          :disabled="loading"
-          box
-        />
-      </VFlex>
+      <DropdownWrapper
+        component="VFlex"
+        sm6
+        md5
+        lg4
+        xl3
+        class="pr-4"
+      >
+        <template #default="{ attach, menuProps }">
+          <VSelect
+            v-model="channelFilter"
+            :label="$tr('channelFilterLabel')"
+            :items="channelFilterOptions"
+            :attach="attach"
+            :menu-props="menuProps"
+            :disabled="loading"
+            box
+          />
+        </template>
+      </DropdownWrapper>
       <VFlex sm6 md5 lg4 xl3 class="pr-5">
         <LanguageDropdown v-model="languageFilter" />
       </VFlex>
@@ -48,10 +58,12 @@
   import Pagination from 'shared/views/Pagination';
   import LoadingText from 'shared/views/LoadingText';
   import { constantsTranslationMixin } from 'shared/mixins';
+  import DropdownWrapper from 'shared/views/form/DropdownWrapper';
 
   export default {
     name: 'ChannelList',
     components: {
+      DropdownWrapper,
       ChannelInfoCard,
       LanguageDropdown,
       Pagination,
@@ -112,6 +124,7 @@
           [this.channelFilter]: true,
           page: this.$route.query.page || 1,
           exclude: this.currentChannelId,
+          ordering: this.channelFilter === 'public' ? 'name' : '-modified',
           published: true,
         }).then(page => {
           this.pageCount = page.total_pages;
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ImportFromChannelsModal.vue b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ImportFromChannelsModal.vue
index 96a8bba3ec..e3e394602d 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ImportFromChannelsModal.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ImportFromChannelsModal.vue
@@ -17,7 +17,7 @@
       ></div>
     </VFadeTransition>
 
-    <VContainer fluid class="mb-5 pb-5 px-5">
+    <VContainer fluid class="mb-5 modal-container mx-0 pb-5 px-4">
       <slot :preview="handlePreview"></slot>
     </VContainer>
     <ResourceDrawer
@@ -263,5 +263,8 @@
 
 <style lang="less" scoped>
 
+  .modal-container.fluid {
+    max-width: 1200px;
+  }
 
 </style>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchFilterBar.vue b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchFilterBar.vue
index 10c0ad2a53..d77ddf871a 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchFilterBar.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchFilterBar.vue
@@ -1,6 +1,6 @@
 <template>
 
-  <VContainer class="pt-3 px-0" fluid>
+  <VContainer class="pt-3 px-2" fluid>
     <VChip
       v-for="(filter, index) in currentFilters"
       :key="`search-filter-${index}`"
@@ -121,7 +121,7 @@
     $trs: {
       coachContent: 'Resources for coaches',
       assessments: 'Assessments',
-      topicsHidden: 'No folders',
+      topicsHidden: 'Folders excluded',
       createdAfter: "Added after '{date}'",
       clearAll: 'Clear all',
     },
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchFilters.vue b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchFilters.vue
index e6c3f3b4b1..4f1d71203c 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchFilters.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchFilters.vue
@@ -1,17 +1,26 @@
 <template>
 
-  <VNavigationDrawer permanent floating style="z-index: 0;">
+  <VNavigationDrawer
+    permanent
+    floating
+    class="import-search-filters px-2"
+  >
     <!-- Channel -->
     <p class="font-weight-bold grey--text mb-1">
       {{ $tr('channelsHeader') }}
     </p>
-    <VSelect
-      v-model="channelType"
-      :label="$tr('channelTypeLabel')"
-      :items="channelTypeFilterOptions"
-      box
-      :menu-props="menuProps"
-    />
+    <DropdownWrapper menuHeight="270">
+      <template #default="{ attach, menuProps }">
+        <VSelect
+          v-model="channelType"
+          :label="$tr('channelTypeLabel')"
+          :items="channelTypeFilterOptions"
+          box
+          :attach="attach"
+          :menu-props="menuProps"
+        />
+      </template>
+    </DropdownWrapper>
     <MultiSelect
       v-model="channel_id__in"
       :label="$tr('channelSourceLabel')"
@@ -55,9 +64,9 @@
       v-model="kinds"
       :items="kindFilterOptions"
       :label="$tr('kindLabel')"
+      item-text="text"
     />
 
-
     <!-- Language -->
     <LanguageDropdown
       v-model="languages"
@@ -69,6 +78,7 @@
       v-model="licenses"
       :items="licenseOptions"
       :label="$tr('licensesLabel')"
+      item-text="text"
     />
 
     <!-- Created after -->
@@ -119,13 +129,15 @@
   import MultiSelect from 'shared/views/form/MultiSelect';
   import Checkbox from 'shared/views/form/Checkbox';
   import LanguageDropdown from 'shared/views/LanguageDropdown';
+  import DropdownWrapper from 'shared/views/form/DropdownWrapper';
 
-  const excludedKinds = new Set(['topic', 'exercise', 'h5p']);
+  const excludedKinds = new Set(['topic', 'exercise', 'h5p', 'zim']);
   const includedKinds = ContentKindsList.filter(kind => !excludedKinds.has(kind));
 
   export default {
     name: 'SearchFilters',
     components: {
+      DropdownWrapper,
       MultiSelect,
       Checkbox,
       LanguageDropdown,
@@ -177,9 +189,6 @@
           };
         });
       },
-      menuProps() {
-        return { offsetY: true, maxHeight: 270 };
-      },
       licenseOptions() {
         return LicensesList.map(license => {
           return {
@@ -225,6 +234,12 @@
 
 <style lang="less" scoped>
 
+  .import-search-filters {
+    z-index: 0;
+    box-sizing: border-box;
+    overflow: visible;
+  }
+
   .fieldset-reset {
     border-style: none;
   }
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchOrBrowseWindow.vue b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchOrBrowseWindow.vue
index cd014be30d..4ee436398d 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchOrBrowseWindow.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchOrBrowseWindow.vue
@@ -3,7 +3,7 @@
   <ImportFromChannelsModal>
     <template #default="{ preview }">
       <VSheet>
-        <div v-if="!isBrowsing" class="my-2">
+        <div v-if="!isBrowsing" class="my-2 px-2">
           <ActionLink
             :text="$tr('backToBrowseAction')"
             @click="handleBackToBrowse"
@@ -11,8 +11,8 @@
         </div>
 
         <!-- Search bar -->
-        <VLayout row wrap class="mt-4">
-          <VFlex xl4 lg5 md7 sm12>
+        <VLayout row wrap class="mt-4 px-2">
+          <VFlex style="max-width: 700px">
             <VForm ref="search" @submit.prevent="handleSearchTerm">
               <VTextField
                 v-model="searchTerm"
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchResultsList.vue b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchResultsList.vue
index d1329827fe..131cbe5ca7 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchResultsList.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchResultsList.vue
@@ -4,19 +4,21 @@
     <!-- Filters -->
     <SearchFilterBar />
     <VLayout row>
-      <VFlex class="px-2" sm3>
-        <ActionLink
-          class="mb-3"
-          :text="$tr('savedSearchesLabel')"
-          @click="showSavedSearches = true"
-        />
+      <VFlex shrink>
+        <div class="px-2">
+          <ActionLink
+            class="mb-3"
+            :text="$tr('savedSearchesLabel')"
+            @click="showSavedSearches = true"
+          />
+        </div>
         <SearchFilters
           :searchResults="nodes"
         />
       </VFlex>
 
       <!-- Main area with cards -->
-      <VFlex sm9>
+      <VFlex class="pl-4">
         <VContainer v-if="loadFailed">
           <p class="text-xs-center">
             <Icon color="red">
@@ -27,9 +29,9 @@
             {{ $tr('failedToLoad') }}
           </p>
         </VContainer>
-        <VContainer v-else class="mx-0">
+        <VContainer v-else class="mx-0 px-1">
           <LoadingText v-if="loading" />
-          <VLayout v-else row align-center class="mx-4">
+          <VLayout v-else row align-center>
             <VFlex grow>
               <span class="font-weight-bold subheading">
                 {{ $tr('searchResultsCount', {
@@ -55,16 +57,17 @@
               </span>
             </VFlex>
           </VLayout>
-          <div class="px-4">
-            <VLayout v-for="node in nodes" :key="node.id" row align-center>
-              <VFlex shrink>
+          <div>
+            <VLayout v-for="node in nodes" :key="node.id" row align-center class="py-2">
+              <VFlex class="px-1" shrink>
                 <Checkbox
                   :key="`checkbox-${node.id}`"
                   :input-value="isSelected(node)"
+                  class="mt-0 pt-0"
                   @change="toggleSelected(node)"
                 />
               </VFlex>
-              <VFlex class="pa-4" grow>
+              <VFlex shrink grow style="width: 100%;">
                 <BrowsingCard
                   :node="node"
                   :inSearch="true"
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/progress/ProgressModal.vue b/contentcuration/contentcuration/frontend/channelEdit/views/progress/ProgressModal.vue
index b720041ee5..f5ce76de6b 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/progress/ProgressModal.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/progress/ProgressModal.vue
@@ -14,7 +14,7 @@
       {{ $tr('syncError') }}
     </div>
     <div
-      v-if="currentPublishTaskError"
+      v-else-if="currentPublishTaskError"
       class="red--text"
     >
       <Icon small color="red">
@@ -105,12 +105,12 @@
       clearInterval(this.timer);
     },
     $trs: {
-      defaultErrorText: 'Last publish failed.',
+      defaultErrorText: 'Last attempt to publish failed',
       publishHeader: 'Publishing channel',
       lastPublished: 'Published {last_published}',
       unpublishedText: 'Unpublished',
       syncHeader: 'Syncing channel',
-      syncError: 'Last sync failed',
+      syncError: 'Last attempt to sync failed',
     },
   };
 
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/progress/__tests__/progressModal.spec.js b/contentcuration/contentcuration/frontend/channelEdit/views/progress/__tests__/progressModal.spec.js
index d160a94782..61df49ad6e 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/progress/__tests__/progressModal.spec.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/progress/__tests__/progressModal.spec.js
@@ -98,7 +98,7 @@ describe('ProgressModal', () => {
       });
 
       it('should display an error message', () => {
-        expect(wrapper.text()).toContain('Last publish failed.');
+        expect(wrapper.text()).toContain('Last attempt to publish failed');
       });
 
       it('should not display progress', () => {
@@ -189,7 +189,7 @@ describe('ProgressModal', () => {
       });
 
       it('should display error', () => {
-        expect(wrapper.text()).toContain('Last sync failed');
+        expect(wrapper.text()).toContain('Last attempt to sync failed');
       });
     });
 
diff --git a/contentcuration/contentcuration/frontend/channelEdit/vuex/assessmentItem/mutations.js b/contentcuration/contentcuration/frontend/channelEdit/vuex/assessmentItem/mutations.js
index 64cc9376b1..943fa59de0 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/vuex/assessmentItem/mutations.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/vuex/assessmentItem/mutations.js
@@ -46,8 +46,15 @@ export function UPDATE_ASSESSMENTITEM(state, assessmentItem) {
 }
 
 export function UPDATE_ASSESSMENTITEM_FROM_INDEXEDDB(state, { id, ...mods }) {
-  if (id && state.assessmentItemsMap[id]) {
-    applyMods(state.assessmentItemsMap[id], mods);
+  const [contentnode, assessment_id] = id || [null, null];
+  if (
+    id &&
+    state.assessmentItemsMap[contentnode] &&
+    state.assessmentItemsMap[contentnode][assessment_id]
+  ) {
+    Vue.set(state.assessmentItemsMap[contentnode], assessment_id, {
+      ...applyMods(state.assessmentItemsMap[contentnode][assessment_id], mods),
+    });
   }
 }
 
diff --git a/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/__tests__/mutations.spec.js b/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/__tests__/mutations.spec.js
index a8bb1ce4da..ccd3a03d1d 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/__tests__/mutations.spec.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/__tests__/mutations.spec.js
@@ -1,4 +1,6 @@
+import Vue from 'vue';
 import { SAVE_NEXT_STEPS, REMOVE_PREVIOUS_STEP, ADD_PREVIOUS_STEP } from '../mutations';
+import { factory } from '../../../store';
 
 describe('contentNode mutations', () => {
   describe('SAVE_NEXT_STEPS', () => {
@@ -186,4 +188,56 @@ describe('contentNode mutations', () => {
       expect(state.previousStepsMap).toEqual(maps.previousStepsMap);
     });
   });
+  describe('UPDATE_CONTENTNODE_FROM_INDEXEDDB', () => {
+    it('should ensure that nested object properties are reactively set', async () => {
+      const store = factory();
+      store.commit('contentNode/ADD_CONTENTNODE', { id: 'test', extra_fields: null });
+      await Vue.nextTick();
+      const spy = jest.fn();
+      store.watch(state => {
+        const node = state.contentNode.contentNodesMap.test;
+        const value =
+          node &&
+          node.extra_fields &&
+          node.extra_fields.options &&
+          node.extra_fields.options.completion_criteria &&
+          node.extra_fields.options.completion_criteria.threshold;
+        spy(value);
+      });
+      store.commit('contentNode/UPDATE_CONTENTNODE_FROM_INDEXEDDB', {
+        id: 'test',
+        'extra_fields.options.modality': 'QUIZ',
+      });
+      await Vue.nextTick();
+      expect(store.state.contentNode.contentNodesMap.test.extra_fields.options.modality).toEqual(
+        'QUIZ'
+      );
+      store.commit('contentNode/UPDATE_CONTENTNODE_FROM_INDEXEDDB', {
+        id: 'test',
+        'extra_fields.options.modality': null,
+        'extra_fields.options.completion_criteria.model': 'time',
+      });
+      await Vue.nextTick();
+      expect(
+        store.state.contentNode.contentNodesMap.test.extra_fields.options.modality
+      ).toBeUndefined();
+      expect(
+        store.state.contentNode.contentNodesMap.test.extra_fields.options.completion_criteria.model
+      ).toEqual('time');
+      store.commit('contentNode/UPDATE_CONTENTNODE_FROM_INDEXEDDB', {
+        id: 'test',
+        'extra_fields.options.completion_criteria.threshold': 5,
+      });
+      await Vue.nextTick();
+      expect(
+        store.state.contentNode.contentNodesMap.test.extra_fields.options.completion_criteria.model
+      ).toEqual('time');
+      expect(
+        store.state.contentNode.contentNodesMap.test.extra_fields.options.completion_criteria
+          .threshold
+      ).toEqual(5);
+      // The watch function is invoked when initially set, so this is invoked 4 times, not 3.
+      expect(spy).toHaveBeenCalledTimes(4);
+    });
+  });
 });
diff --git a/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/mutations.js b/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/mutations.js
index dbc7884a80..8ad76a3572 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/mutations.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/mutations.js
@@ -16,7 +16,9 @@ export function ADD_CONTENTNODES(state, contentNodes = []) {
 
 export function UPDATE_CONTENTNODE_FROM_INDEXEDDB(state, { id, ...updates }) {
   if (id && state.contentNodesMap[id]) {
-    applyMods(state.contentNodesMap[id], updates);
+    // 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) });
   }
 }
 
diff --git a/contentcuration/contentcuration/frontend/channelEdit/vuex/importFromChannels/mutations.js b/contentcuration/contentcuration/frontend/channelEdit/vuex/importFromChannels/mutations.js
index caef2b0c58..1f5e6386e7 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/vuex/importFromChannels/mutations.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/vuex/importFromChannels/mutations.js
@@ -17,7 +17,7 @@ export function UPDATE_SAVEDSEARCH(state, search) {
 
 export function UPDATE_SAVEDSEARCH_FROM_INDEXEDDB(state, { id, ...updates }) {
   if (id && state.savedSearches[id]) {
-    applyMods(state.savedSearches[id], updates);
+    Vue.set(state.savedSearches, id, { ...applyMods(state.savedSearches[id], updates) });
   }
 }
 
diff --git a/contentcuration/contentcuration/frontend/channelEdit/vuex/task/index.js b/contentcuration/contentcuration/frontend/channelEdit/vuex/task/index.js
index 56c55e32d7..657757e9af 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/vuex/task/index.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/vuex/task/index.js
@@ -39,7 +39,7 @@ export default {
     },
     UPDATE_ASYNC_TASK_FROM_INDEXEDDB(state, { task_id, ...mods }) {
       if (task_id && state.asyncTasksMap[task_id]) {
-        applyMods(state.asyncTasksMap[task_id], mods);
+        Vue.set(state.asyncTasksMap, task_id, { ...applyMods(state.asyncTasksMap[task_id], mods) });
       }
     },
     REMOVE_ASYNC_TASK(state, asyncTask) {
diff --git a/contentcuration/contentcuration/frontend/channelList/views/Channel/CatalogFilters.vue b/contentcuration/contentcuration/frontend/channelList/views/Channel/CatalogFilters.vue
index ab9828c707..2576d4a54f 100644
--- a/contentcuration/contentcuration/frontend/channelList/views/Channel/CatalogFilters.vue
+++ b/contentcuration/contentcuration/frontend/channelList/views/Channel/CatalogFilters.vue
@@ -52,6 +52,7 @@
           v-model="licenses"
           :items="licenseOptions"
           :label="$tr('licenseLabel')"
+          item-text="text"
         />
 
         <!-- Formats (attach to self to keep in notranslate class) -->
@@ -59,6 +60,7 @@
           v-model="kinds"
           :items="kindOptions"
           :label="$tr('formatLabel')"
+          item-text="text"
         />
 
         <!-- Starred -->
diff --git a/contentcuration/contentcuration/frontend/channelList/views/Channel/ChannelList.vue b/contentcuration/contentcuration/frontend/channelList/views/Channel/ChannelList.vue
index 68f506cba2..b1d8327b87 100644
--- a/contentcuration/contentcuration/frontend/channelList/views/Channel/ChannelList.vue
+++ b/contentcuration/contentcuration/frontend/channelList/views/Channel/ChannelList.vue
@@ -48,7 +48,7 @@
 
   import { mapGetters, mapActions } from 'vuex';
   import orderBy from 'lodash/orderBy';
-  import { RouteNames, CHANNEL_PAGE_SIZE } from '../../constants';
+  import { RouteNames } from '../../constants';
   import ChannelItem from './ChannelItem';
   import LoadingText from 'shared/views/LoadingText';
   import { ChannelListTypes } from 'shared/constants';
@@ -98,9 +98,6 @@
       isEditable() {
         return this.listType === ChannelListTypes.EDITABLE;
       },
-      isStarred() {
-        return this.listType === ChannelListTypes.STARRED;
-      },
     },
     watch: {
       listType(newListType) {
@@ -129,17 +126,6 @@
       },
       loadData(listType) {
         this.loading = true;
-        let parameters = {
-          listType,
-          sortBy: '-modified',
-        };
-
-        // Don't paginate bookmarked channel list for more
-        // rapid updating when channels are starred/unstarred
-        if (!this.isStarred) {
-          parameters.page = Number(this.$route.query.page || 1);
-          parameters.page_size = CHANNEL_PAGE_SIZE;
-        }
 
         this.loadChannelList({ listType }).then(() => {
           this.loading = false;
diff --git a/contentcuration/contentcuration/frontend/channelList/vuex/channelSet/mutations.js b/contentcuration/contentcuration/frontend/channelList/vuex/channelSet/mutations.js
index aeb0391492..bbca8457ad 100644
--- a/contentcuration/contentcuration/frontend/channelList/vuex/channelSet/mutations.js
+++ b/contentcuration/contentcuration/frontend/channelList/vuex/channelSet/mutations.js
@@ -34,7 +34,7 @@ export function UPDATE_CHANNELSET(state, { id, ...payload }) {
 
 export function UPDATE_CHANNELSET_FROM_INDEXEDDB(state, { id, ...mods }) {
   if (id && state.channelSetsMap[id]) {
-    applyMods(state.channelSetsMap[id], mods);
+    Vue.set(state.channelSetsMap, id, { ...applyMods(state.channelSetsMap[id], mods) });
   }
 }
 
diff --git a/contentcuration/contentcuration/frontend/shared/data/__tests__/ContentNodeResource.spec.js b/contentcuration/contentcuration/frontend/shared/data/__tests__/ContentNodeResource.spec.js
index de89ccf042..fc0dcb9a83 100644
--- a/contentcuration/contentcuration/frontend/shared/data/__tests__/ContentNodeResource.spec.js
+++ b/contentcuration/contentcuration/frontend/shared/data/__tests__/ContentNodeResource.spec.js
@@ -664,6 +664,7 @@ describe('ContentNode methods', () => {
         parent: parent.id,
         lft: 1,
         node_id: expect.not.stringMatching(new RegExp(`${node.node_id}|${parent.node_id}`)),
+        original_channel_id: node.original_channel_id || node.channel_id,
         original_source_node_id: node.original_source_node_id,
         source_channel_id: node.channel_id,
         source_node_id: node.node_id,
diff --git a/contentcuration/contentcuration/frontend/shared/data/changes.js b/contentcuration/contentcuration/frontend/shared/data/changes.js
index 0ecd5ca993..5c2c0b616b 100644
--- a/contentcuration/contentcuration/frontend/shared/data/changes.js
+++ b/contentcuration/contentcuration/frontend/shared/data/changes.js
@@ -1,8 +1,13 @@
 import Dexie from 'dexie';
+import sortBy from 'lodash/sortBy';
 import db from 'shared/data/db';
 import { promiseChunk } from 'shared/utils/helpers';
-import { CHANGES_TABLE, CHANGE_TYPES, IGNORED_SOURCE } from 'shared/data/constants';
-import { Session } from 'shared/data/resources';
+import {
+  CHANGES_TABLE,
+  CHANGE_TYPES,
+  IGNORED_SOURCE,
+  RELATIVE_TREE_POSITIONS,
+} from 'shared/data/constants';
 import { INDEXEDDB_RESOURCES } from 'shared/data/registry';
 
 /**
@@ -61,15 +66,9 @@ export class ChangeTracker {
     }
 
     // Grab the most recent change in the changes table, if it exists, which it might not
-    // if everything has been synced and applied, otherwise check the session for its max rev
-    const [mostRecentChange, session] = await Promise.all([
-      db[CHANGES_TABLE].orderBy('rev').last(),
-      Session.getSession(),
-    ]);
-
-    this._startingRev = mostRecentChange
-      ? mostRecentChange.rev
-      : session.max_rev[Session.currentChannelId];
+    const mostRecentChange = await db[CHANGES_TABLE].orderBy('rev').last();
+
+    this._startingRev = mostRecentChange ? mostRecentChange.rev : null;
   }
 
   /**
@@ -78,10 +77,16 @@ export class ChangeTracker {
    */
   async stop() {
     // Collect the changes
-    const changes = db[CHANGES_TABLE].where('rev')
-      .above(this._startingRev)
-      .filter(change => !change.source.match(IGNORED_SOURCE));
-    this._changes = await changes.sortBy('rev');
+    let changes = db[CHANGES_TABLE];
+
+    // If we had a starting rev, filter to only those changes added since
+    if (this._startingRev) {
+      changes = changes.where('rev').above(this._startingRev);
+    }
+
+    this._changes = await changes
+      .filter(change => !change.source.match(IGNORED_SOURCE))
+      .sortBy('rev');
   }
 
   /**
@@ -131,7 +136,7 @@ export class ChangeTracker {
         }
         return Promise.resolve();
       }
-      return resource.transaction({}, () => {
+      return resource.transaction({}, CHANGES_TABLE, () => {
         // If we had created something, we'll delete it
         // Special MOVED case here comes from the operation of COPY then MOVE for duplicating
         // content nodes, which in this case would be on the Tree table, so we're removing
@@ -151,9 +156,21 @@ export class ChangeTracker {
           // If we updated or deleted it, we just want the old stuff back
           return resource.table.put(change.oldObj);
         } else if (change.type === CHANGE_TYPES.MOVED && change.oldObj) {
-          // Lastly if this is a MOVE, then this was likely a single operation, so we just roll
-          // it back
-          return resource.table.put(change.oldObj);
+          // Lastly if this is a MOVE, we generate a reverse move back to its old position
+          const { parent, lft } = change.oldObj;
+
+          // Collect the affected node's siblings prior to the change
+          return resource.where({ parent }, false).then(siblings => {
+            // Search the siblings ordered by `lft` to find the first a sibling
+            // where we should move the node, positioned before that sibling
+            let relativeSibling = sortBy(siblings, 'lft').find(sibling => sibling.lft >= lft);
+            if (relativeSibling) {
+              return resource.move(change.key, relativeSibling.id, RELATIVE_TREE_POSITIONS.LEFT);
+            }
+
+            // this handles if there were no siblings OR if the deleted node was at the end
+            return resource.move(change.key, parent, RELATIVE_TREE_POSITIONS.LAST_CHILD);
+          });
         } else {
           if (process.env.NODE_ENV !== 'production') {
             /* eslint-disable no-console */
diff --git a/contentcuration/contentcuration/frontend/shared/data/constants.js b/contentcuration/contentcuration/frontend/shared/data/constants.js
index 2a6204c2c2..8e658c0ecb 100644
--- a/contentcuration/contentcuration/frontend/shared/data/constants.js
+++ b/contentcuration/contentcuration/frontend/shared/data/constants.js
@@ -7,6 +7,16 @@ export const CHANGE_TYPES = {
   PUBLISHED: 6,
   SYNCED: 7,
 };
+/**
+ * An array of change types that directly result in the creation of nodes
+ * @type {(number)[]}
+ */
+export const CREATION_CHANGE_TYPES = [CHANGE_TYPES.CREATED, CHANGE_TYPES.COPIED];
+/**
+ * An array of change types that directly result in changes to tree structure
+ * @type {(number)[]}
+ */
+export const TREE_CHANGE_TYPES = [CHANGE_TYPES.CREATED, CHANGE_TYPES.COPIED, CHANGE_TYPES.MOVED];
 
 // Tables
 export const CHANGES_TABLE = 'changesForSyncing';
diff --git a/contentcuration/contentcuration/frontend/shared/data/mergeChanges.js b/contentcuration/contentcuration/frontend/shared/data/mergeChanges.js
index 3fb3b68c6c..d7f4c8274d 100644
--- a/contentcuration/contentcuration/frontend/shared/data/mergeChanges.js
+++ b/contentcuration/contentcuration/frontend/shared/data/mergeChanges.js
@@ -22,18 +22,12 @@ import Dexie from 'dexie';
 import flatMap from 'lodash/flatMap';
 import { CHANGE_TYPES } from './constants';
 import { INDEXEDDB_RESOURCES } from './registry';
-
-function applyModifications(obj, modifications) {
-  Object.keys(modifications).forEach(function(keyPath) {
-    Dexie.setByKeyPath(obj, keyPath, modifications[keyPath]);
-  });
-  return obj;
-}
+import { applyMods } from './applyRemoteChanges';
 
 function combineCreateAndUpdate(oldChange, newChange) {
   // Apply modifications to existing object.
   // Passed in object should be modifiable, so no need to clone.
-  applyModifications(oldChange.obj, newChange.mods);
+  applyMods(oldChange.obj, newChange.mods);
   return oldChange;
 }
 
diff --git a/contentcuration/contentcuration/frontend/shared/data/resources.js b/contentcuration/contentcuration/frontend/shared/data/resources.js
index 0895babd25..e83b686384 100644
--- a/contentcuration/contentcuration/frontend/shared/data/resources.js
+++ b/contentcuration/contentcuration/frontend/shared/data/resources.js
@@ -26,6 +26,8 @@ import {
   CHANNEL_SYNC_KEEP_ALIVE_INTERVAL,
   MAX_REV_KEY,
   LAST_FETCHED,
+  CREATION_CHANGE_TYPES,
+  TREE_CHANGE_TYPES,
 } from './constants';
 import applyChanges, { applyMods, collectChanges } from './applyRemoteChanges';
 import mergeAllChanges from './mergeChanges';
@@ -685,27 +687,45 @@ class Resource extends mix(APIResource, IndexedDBResource) {
       if (objs === EMPTY_ARRAY) {
         return [];
       }
-      if (!objs.length && !objs.count) {
-        return this.fetchCollection(params);
-      }
-      if (doRefresh) {
-        // Only fetch new updates if we've finished syncing the changes table
-        db[CHANGES_TABLE].where('table')
-          .equals(this.tableName)
-          .limit(1)
-          .toArray()
-          .then(pendingChanges => {
-            if (pendingChanges.length === 0) {
-              this.fetchCollection(params);
-            }
-          });
+      // 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 tree structure
+          refresh = db[CHANGES_TABLE].where('table')
+            .equals(TABLE_NAMES.CONTENTNODE)
+            .filter(c => TREE_CHANGE_TYPES.includes(c.type))
+            .count()
+            .then(pendingCount => pendingCount === 0);
+        }
+
+        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;
+        }
       }
       return objs;
     });
   }
 
   headModel(id) {
-    return client.head(this.modelUrl(id));
+    // If the resource identified by `id` has just been created, but we haven't verified
+    // the server has applied the change yet, we skip making the HEAD request for it
+    return db[CHANGES_TABLE].where('[table+key]')
+      .equals([this.tableName, id])
+      .filter(c => CREATION_CHANGE_TYPES.includes(c.type))
+      .count()
+      .then(pendingCount => {
+        if (pendingCount === 0) {
+          return client.head(this.modelUrl(id));
+        }
+      });
   }
 
   fetchModel(id) {
@@ -1016,7 +1036,12 @@ export const Channel = new Resource({
         () => {
           return Promise.all([
             db[CHANGES_TABLE].put(change),
-            ContentNode.table.where({ channel_id: id }).modify({ changed: false, published: true }),
+            ContentNode.table.where({ channel_id: id }).modify({
+              changed: false,
+              published: true,
+              has_new_descendants: false,
+              has_updated_descendants: false,
+            }),
           ]);
         }
       );
@@ -1392,6 +1417,7 @@ export const ContentNode = new TreeResource({
       // Placeholder node_id, we should receive the new value from backend result
       node_id: uuid4(),
       original_source_node_id: node.original_source_node_id || node.node_id,
+      original_channel_id: node.original_channel_id || node.channel_id,
       source_channel_id: node.channel_id,
       source_node_id: node.node_id,
       channel_id: parent.channel_id,
@@ -1791,6 +1817,10 @@ export const Task = new IndexedDBResource({
   tableName: TABLE_NAMES.TASK,
   idField: 'task_id',
   setTasks(tasks) {
+    for (let task of tasks) {
+      // Coerce channel_id to be a simple hex string
+      task.channel_id = task.channel_id.replace('-', '');
+    }
     return this.transaction({ mode: 'rw', source: IGNORED_SOURCE }, () => {
       return this.table
         .where(this.idField)
diff --git a/contentcuration/contentcuration/frontend/shared/mixins.js b/contentcuration/contentcuration/frontend/shared/mixins.js
index b981f14a96..310e69e162 100644
--- a/contentcuration/contentcuration/frontend/shared/mixins.js
+++ b/contentcuration/contentcuration/frontend/shared/mixins.js
@@ -430,7 +430,7 @@ export const metadataStrings = createTranslator('CommonMetadataStrings', {
     message: 'Numeracy',
     context: 'Category type. See https://en.wikipedia.org/wiki/Numeracy',
   },
-  digitialLiteracy: {
+  digitalLiteracy: {
     message: 'Digital literacy',
     context: 'Category type. See https://en.wikipedia.org/wiki/Digital_literacy',
   },
@@ -513,27 +513,36 @@ export const metadataStrings = createTranslator('CommonMetadataStrings', {
   },
 
   // Resources Needed Categories = {
-  ForBeginners: {
+  forBeginners: {
     message: 'For beginners',
     context: 'Filter option and a label for the resources in the Kolibri Library.',
   },
-  ToUseWithTeachersAndPeers: {
-    message: 'To use with teachers and peers',
-    context:
-      "'Peers' in this context refers to classmates or other learners who are interacting with Kolibri.",
-  },
-  ToUseWithPaperAndPencil: {
-    message: 'To use with paper and pencil',
+  toUseWithPaperAndPencil: {
+    message: 'Paper and pencil',
     context: 'Refers to a filter for resources.\n',
   },
-  NeedsInternet: {
-    message: 'That need internet connection',
+  needsInternet: {
+    message: 'Internet connection',
     context: 'Refers to a filter for resources.',
   },
-  NeedsMaterials: {
-    message: 'That need other materials',
+  needsMaterials: {
+    message: 'Other supplies',
     context: 'Refers to a filter for resources.\n',
   },
+  softwareTools: {
+    message: 'Other software tools',
+    context: 'Refers to a filter for resources that need additional software to be used.',
+  },
+  peers: {
+    message: 'Working with peers',
+    context:
+      'Refers to a filter for resources that require a learner to work with other learners to be used.',
+  },
+  teacher: {
+    message: 'Working with a teacher',
+    context:
+      'Refers to a filter for resources that require a learner to work with a teacher to be used.',
+  },
 
   // Accessibility category name
   accessibility: {
@@ -543,12 +552,12 @@ export const metadataStrings = createTranslator('CommonMetadataStrings', {
   },
   // Accessibility Categories
   signLanguage: {
-    message: 'Has sign language captions',
+    message: 'Includes sign language captions',
     context:
       'https://en.wikipedia.org/wiki/Sign_language\nhttps://en.wikipedia.org/wiki/List_of_sign_languages\nWherever communities of deaf people exist, sign languages have developed as useful means of communication, and they form the core of local Deaf cultures. Although signing is used primarily by the deaf and hard of hearing, it is also used by hearing individuals, such as those unable to physically speak, those who have trouble with spoken language due to a disability or condition (augmentative and alternative communication), or those with deaf family members, such as children of deaf adults. ',
   },
   audioDescription: {
-    message: 'Has audio descriptions',
+    message: 'Includes audio descriptions',
     context:
       'Content has narration used to provide information surrounding key visual elements for the benefit of blind and visually impaired users.\nhttps://en.wikipedia.org/wiki/Audio_description',
   },
@@ -558,17 +567,17 @@ export const metadataStrings = createTranslator('CommonMetadataStrings', {
       'A tagged PDF includes hidden accessibility markups (tags) that make the document accessible to those who use screen readers and other assistive technology (AT).\n\nhttps://taggedpdf.com/what-is-a-tagged-pdf/',
   },
   altText: {
-    message: 'Has alternative text description for images',
+    message: 'Includes alternative text descriptions for images',
     context:
       'Alternative text, or alt text, is a written substitute for an image. It is used to describe information being provided by an image, graph, or any other visual element on a web page. It provides information about the context and function of an image for people with varying degrees of visual and cognitive impairments. When a screen reader encounters an image, it will read aloud the alternative text.\nhttps://www.med.unc.edu/webguide/accessibility/alt-text/',
   },
   highContrast: {
-    message: 'Has high contrast display for low vision',
+    message: 'Includes high contrast text for learners with low vision',
     context:
       "Accessibility filter used to search for resources that have high contrast color themes for users with low vision ('display' refers to digital content, not the hardware like screens or monitors).\nhttps://veroniiiica.com/2019/10/25/high-contrast-color-schemes-low-vision/",
   },
   captionsSubtitles: {
-    message: 'Has captions or subtitles',
+    message: 'Includes captions or subtitles',
     context:
       'Accessibility filter to search for video and audio resources that have text captions for users who are deaf or hard of hearing.\nhttps://www.w3.org/WAI/media/av/captions/',
   },
@@ -666,23 +675,17 @@ export const metadataTranslationMixin = {
  * - Keys which, when _.camelCase()'ed will not result in a valid key, requiring manual mapping
  */
 const nonconformingKeys = {
-  PEOPLE: 'ToUseWithTeachersAndPeers',
-  PAPER_PENCIL: 'ToUseWithPaperAndPencil',
-  INTERNET: 'NeedsInternet',
-  FOR_BEGINNERS: 'ForBeginners',
-  digitalLiteracy: 'digitialLiteracy',
+  PAPER_PENCIL: 'toUseWithPaperAndPencil',
+  PEERS: 'peers',
+  TEACHER: 'teacher',
+  INTERNET: 'needsInternet',
   BASIC_SKILLS: 'allLevelsBasicSkills',
   FOUNDATIONS: 'basicSkills',
   foundationsLogicAndCriticalThinking: 'logicAndCriticalThinking',
   toolsAndSoftwareTraining: 'softwareToolsAndTraining',
   foundations: 'basicSkills',
-
-  /*
-   * TODO: the following are in ResourcesNeededTypes map from le-utils, but not in Kolibri,
-   * and should be tracked in the issue - https://github.com/learningequality/kolibri/issues/9245
-   */
-  OTHER_SUPPLIES: 'NeedsMaterials',
-  SPECIAL_SOFTWARE: 'softwareToolsAndTraining',
+  OTHER_SUPPLIES: 'needsMaterials',
+  SPECIAL_SOFTWARE: 'softwareTools',
 };
 
 /**
diff --git a/contentcuration/contentcuration/frontend/shared/styles/main.less b/contentcuration/contentcuration/frontend/shared/styles/main.less
index 49b471058e..e930d93658 100644
--- a/contentcuration/contentcuration/frontend/shared/styles/main.less
+++ b/contentcuration/contentcuration/frontend/shared/styles/main.less
@@ -68,6 +68,10 @@ body {
     right: auto;
     left: 16px;
   }
+
+  .v-input {
+    text-align: right;
+  }
 }
 
 /*! rtl:end:ignore */
diff --git a/contentcuration/contentcuration/frontend/shared/translator.js b/contentcuration/contentcuration/frontend/shared/translator.js
index 5cf1f5b50f..b52eecaf59 100644
--- a/contentcuration/contentcuration/frontend/shared/translator.js
+++ b/contentcuration/contentcuration/frontend/shared/translator.js
@@ -1,6 +1,7 @@
 import { createTranslator } from 'shared/i18n';
 
 const MESSAGES = {
+  fieldRequired: 'This field is required',
   titleRequired: 'Title is required',
   licenseRequired: 'License is required',
   copyrightHolderRequired: 'Copyright holder is required',
@@ -17,13 +18,12 @@ const MESSAGES = {
   learningActivityRequired: 'Learning activity is required',
   durationRequired: 'Duration is required',
   activityDurationRequired: 'This field is required',
-  shortActivityGteOne: 'Short activity must be greater than or equal to 1',
-  shortActivityLteThirty: 'Short activity must be less than or equal to 30',
-  longActivityGtThirty: 'Long activity must be greater than 30',
-  longActivityLteOneTwenty: 'Long activity must be less than or equal to 120',
-  activityDurationTimeMinRequirement: 'Time must be greater than or equal to 1',
+  activityDurationGteOne: 'Value must be equal to or greater than 1',
+  shortActivityLteThirty: 'Value must be equal or less than 30',
+  longActivityGtThirty: 'Value must be greater than 30',
+  longActivityLteOneTwenty: 'Value must be equal or less than 120',
   activityDurationTooLongWarning:
-    'Please make sure this is the amount of time you want learners to spend on this resource to complete it',
+    'This value is very high. Please make sure this is how long learners should work on the resource for, in order to complete it.',
 };
 
 export default createTranslator('sharedVue', MESSAGES);
diff --git a/contentcuration/contentcuration/frontend/shared/utils/validation.js b/contentcuration/contentcuration/frontend/shared/utils/validation.js
index 08a37bd8d0..cda5f363b0 100644
--- a/contentcuration/contentcuration/frontend/shared/utils/validation.js
+++ b/contentcuration/contentcuration/frontend/shared/utils/validation.js
@@ -123,23 +123,23 @@ function _getLearningActivity(node) {
 
 function _getErrorMsg(error) {
   const messages = {
-    [ValidationErrors.TITLE_REQUIRED]: translator.$tr('titleRequired'),
-    [ValidationErrors.LICENSE_REQUIRED]: translator.$tr('licenseRequired'),
-    [ValidationErrors.COPYRIGHT_HOLDER_REQUIRED]: translator.$tr('copyrightHolderRequired'),
+    [ValidationErrors.TITLE_REQUIRED]: translator.$tr('fieldRequired'),
+    [ValidationErrors.LICENSE_REQUIRED]: translator.$tr('fieldRequired'),
+    [ValidationErrors.COPYRIGHT_HOLDER_REQUIRED]: translator.$tr('fieldRequired'),
     [ValidationErrors.LICENSE_DESCRIPTION_REQUIRED]: translator.$tr('licenseDescriptionRequired'),
-    [ValidationErrors.MASTERY_MODEL_REQUIRED]: translator.$tr('masteryModelRequired'),
-    [ValidationErrors.MASTERY_MODEL_M_REQUIRED]: translator.$tr('masteryModelMRequired'),
-    [ValidationErrors.MASTERY_MODEL_M_WHOLE_NUMBER]: translator.$tr('masteryModelMWholeNumber'),
+    [ValidationErrors.MASTERY_MODEL_REQUIRED]: translator.$tr('fieldRequired'),
+    [ValidationErrors.MASTERY_MODEL_M_REQUIRED]: translator.$tr('fieldRequired'),
+    [ValidationErrors.MASTERY_MODEL_M_WHOLE_NUMBER]: translator.$tr('fieldRequired'),
     [ValidationErrors.MASTERY_MODEL_M_GT_ZERO]: translator.$tr('masteryModelMGtZero'),
     [ValidationErrors.MASTERY_MODEL_M_LTE_N]: translator.$tr('masteryModelMLteN'),
-    [ValidationErrors.MASTERY_MODEL_N_REQUIRED]: translator.$tr('masteryModelNRequired'),
+    [ValidationErrors.MASTERY_MODEL_N_REQUIRED]: translator.$tr('fieldRequired'),
     [ValidationErrors.MASTERY_MODEL_N_WHOLE_NUMBER]: translator.$tr('masteryModelNWholeNumber'),
     [ValidationErrors.MASTERY_MODEL_N_GT_ZERO]: translator.$tr('masteryModelNGtZero'),
-    [ValidationErrors.LEARNING_ACTIVITY_REQUIRED]: translator.$tr('learningActivityRequired'),
-    [ValidationErrors.DURATION_REQUIRED]: translator.$tr('durationRequired'),
-    [ValidationErrors.ACTIVITY_DURATION_REQUIRED]: translator.$tr('activityDurationRequired'),
+    [ValidationErrors.LEARNING_ACTIVITY_REQUIRED]: translator.$tr('fieldRequired'),
+    [ValidationErrors.DURATION_REQUIRED]: translator.$tr('fieldRequired'),
+    [ValidationErrors.ACTIVITY_DURATION_REQUIRED]: translator.$tr('fieldRequired'),
     [ValidationErrors.ACTIVITY_DURATION_MIN_FOR_SHORT_ACTIVITY]: translator.$tr(
-      'shortActivityGteOne'
+      'activityDurationGteOne'
     ),
     [ValidationErrors.ACTIVITY_DURATION_MAX_FOR_SHORT_ACTIVITY]: translator.$tr(
       'shortActivityLteThirty'
@@ -150,9 +150,7 @@ function _getErrorMsg(error) {
     [ValidationErrors.ACTIVITY_DURATION_MAX_FOR_LONG_ACTIVITY]: translator.$tr(
       'longActivityLteOneTwenty'
     ),
-    [ValidationErrors.ACTIVITY_DURATION_MIN_REQUIREMENT]: translator.$tr(
-      'activityDurationTimeMinRequirement'
-    ),
+    [ValidationErrors.ACTIVITY_DURATION_MIN_REQUIREMENT]: translator.$tr('activityDurationGteOne'),
     [ValidationErrors.ACTIVITY_DURATION_TOO_LONG]: translator.$tr('activityDurationTooLongWarning'),
   };
 
diff --git a/contentcuration/contentcuration/frontend/shared/utils/validation.spec.js b/contentcuration/contentcuration/frontend/shared/utils/validation.spec.js
index 7c71b01216..7d746a489e 100644
--- a/contentcuration/contentcuration/frontend/shared/utils/validation.spec.js
+++ b/contentcuration/contentcuration/frontend/shared/utils/validation.spec.js
@@ -43,7 +43,7 @@ describe('channelEdit utils', () => {
 
     it('returns an error message if a validator function returns an error code for a value', () => {
       const title = '';
-      expect(translateValidator(getTitleValidators()[0])(title)).toBe('Title is required');
+      expect(translateValidator(getTitleValidators()[0])(title)).toBe('This field is required');
     });
   });
 
diff --git a/contentcuration/contentcuration/frontend/shared/views/CopyToken.vue b/contentcuration/contentcuration/frontend/shared/views/CopyToken.vue
index b425d7feca..7206190618 100644
--- a/contentcuration/contentcuration/frontend/shared/views/CopyToken.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/CopyToken.vue
@@ -3,8 +3,8 @@
   <VTextField
     v-if="token"
     v-model="displayToken"
-    :title="$tr('copyPrompt')"
-    appendIcon="content_copy"
+    :title="clipboardAvailable ? $tr('copyPrompt') : ''"
+    :appendIcon="clipboardAvailable ? 'content_copy' : null"
     readonly
     color="primary"
     :hideDetails="true"
@@ -46,20 +46,25 @@
       displayToken() {
         return this.hyphenate ? this.token.slice(0, 5) + '-' + this.token.slice(5) : this.token;
       },
+      clipboardAvailable() {
+        return Boolean(navigator.clipboard);
+      },
     },
     methods: {
       copyToken() {
-        navigator.clipboard
-          .writeText(this.displayToken)
-          .then(() => {
-            let text = this.successText || this.$tr('copiedTokenId');
-            this.$store.dispatch('showSnackbar', { text });
-            this.$analytics.trackEvent('copy_token');
-            this.$emit('copied');
-          })
-          .catch(() => {
-            this.$store.dispatch('showSnackbar', { text: this.$tr('copyFailed') });
-          });
+        if (this.clipboardAvailable) {
+          navigator.clipboard
+            .writeText(this.displayToken)
+            .then(() => {
+              let text = this.successText || this.$tr('copiedTokenId');
+              this.$store.dispatch('showSnackbar', { text });
+              this.$analytics.trackEvent('copy_token');
+              this.$emit('copied');
+            })
+            .catch(() => {
+              this.$store.dispatch('showSnackbar', { text: this.$tr('copyFailed') });
+            });
+        }
       },
     },
     $trs: {
diff --git a/contentcuration/contentcuration/frontend/shared/views/LanguageDropdown.vue b/contentcuration/contentcuration/frontend/shared/views/LanguageDropdown.vue
index 84f199cefa..c2af3b154e 100644
--- a/contentcuration/contentcuration/frontend/shared/views/LanguageDropdown.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/LanguageDropdown.vue
@@ -1,39 +1,43 @@
 <template>
 
-  <VAutocomplete
-    v-model="language"
-    class="language-dropdown"
-    box
-    v-bind="$attrs"
-    :items="languages"
-    :label="$tr('labelText')"
-    color="primary"
-    itemValue="id"
-    :itemText="languageText"
-    autoSelectFirst
-    :allowOverflow="false"
-    clearable
-    :rules="rules"
-    :required="required"
-    :no-data-text="$tr('noDataText')"
-    :search-input.sync="input"
-    :menu-props="menuProps"
-    :multiple="multiple"
-    :chips="multiple"
-    :attach="$attrs.id ? `#${$attrs.id}` : '.language-dropdown'"
-    @change="input = ''"
-    @focus="$emit('focus')"
-  >
-    <template #item="{ item }">
-      <VTooltip bottom lazy>
-        <template #activator="{ on }">
-          <span class="text-truncate" v-on="on">{{ languageText(item) }}</span>
-        </template>
-        <span>{{ languageText(item) }}</span>
-      </VTooltip>
+  <DropdownWrapper>
+    <template #default="{ attach, menuProps }">
+      <VAutocomplete
+        v-model="language"
+        class="language-dropdown"
+        box
+        v-bind="$attrs"
+        :items="languages"
+        :label="$tr('labelText')"
+        color="primary"
+        itemValue="id"
+        :itemText="languageText"
+        autoSelectFirst
+        :allowOverflow="false"
+        clearable
+        :rules="rules"
+        :required="required"
+        :no-data-text="$tr('noDataText')"
+        :search-input.sync="input"
+        :menu-props="{ ...menuProps, maxWidth: 300 }"
+        :multiple="multiple"
+        :chips="multiple"
+        :attach="attach"
+        @change="input = ''"
+        @focus="$emit('focus')"
+      >
+        <template #item="{ item }">
+          <VTooltip bottom lazy>
+            <template #activator="{ on }">
+              <span class="text-truncate" v-on="on">{{ languageText(item) }}</span>
+            </template>
+            <span>{{ languageText(item) }}</span>
+          </VTooltip>
 
+        </template>
+      </VAutocomplete>
     </template>
-  </VAutocomplete>
+  </DropdownWrapper>
 
 </template>
 
@@ -42,9 +46,13 @@
 
   import isArray from 'lodash/isArray';
   import Languages, { LanguagesList } from 'shared/leUtils/Languages';
+  import DropdownWrapper from 'shared/views/form/DropdownWrapper';
 
   export default {
     name: 'LanguageDropdown',
+    components: { DropdownWrapper },
+    // $attrs are rebound to a descendent component
+    inheritAttrs: false,
     props: {
       value: {
         type: [String, Array, Object],
@@ -73,10 +81,6 @@
         type: Boolean,
         default: false,
       },
-      dropAbove: {
-        type: Boolean,
-        default: false,
-      },
     },
     data() {
       return {
@@ -92,13 +96,6 @@
           this.$emit('input', value);
         },
       },
-      menuProps() {
-        return {
-          minWidth: 300,
-          maxWidth: 300,
-          top: this.dropAbove,
-        };
-      },
       languages() {
         const excludeLanguages = new Set(this.excludeLanguages);
         return LanguagesList.filter(l => !excludeLanguages.has(l.id));
@@ -125,11 +122,6 @@
 
 <style lang="less" scoped>
 
-  .language-dropdown {
-    display: inline-block;
-    width: 100%;
-  }
-
   /deep/ .v-select__selections {
     width: calc(100% - 48px);
     min-height: 0 !important;
diff --git a/contentcuration/contentcuration/frontend/shared/views/LicenseDropdown.vue b/contentcuration/contentcuration/frontend/shared/views/LicenseDropdown.vue
index 4848f6bf13..9004167be9 100644
--- a/contentcuration/contentcuration/frontend/shared/views/LicenseDropdown.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/LicenseDropdown.vue
@@ -1,45 +1,47 @@
 <template>
 
-  <div class="license-container">
-    <VLayout class="license-dropdown" row align-center>
-      <VSelect
-        ref="license"
-        v-model="license"
-        :items="licenses"
-        :label="$tr('licenseLabel')"
-        color="primary"
-        itemValue="id"
-        :itemText="translate"
-        :disabled="disabled"
-        :required="required"
-        :readonly="readonly"
-        :rules="licenseRules"
-        :placeholder="placeholder"
-        :menu-props="{ offsetY: true, lazy: true, top: true, zIndex: 4 }"
-        class="ma-0"
-        box
-        :attach="$attrs.id ? `#${$attrs.id}` : '.license-container'"
-        @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>
-        </template>
-      </VSelect>
-    </VLayout>
+  <div>
+    <DropdownWrapper component="VLayout" class="license-dropdown" row align-center>
+      <template #default="{ attach, menuProps }">
+        <VSelect
+          ref="license"
+          v-model="license"
+          :items="licenses"
+          :label="$tr('licenseLabel')"
+          color="primary"
+          itemValue="id"
+          :itemText="translate"
+          :disabled="disabled"
+          :required="required"
+          :readonly="readonly"
+          :rules="licenseRules"
+          :placeholder="placeholder"
+          :menu-props="menuProps"
+          class="ma-0"
+          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>
+          </template>
+        </VSelect>
+      </template>
+    </DropdownWrapper>
     <VTextarea
       v-if="isCustom"
       ref="description"
@@ -72,10 +74,12 @@
   import { LicensesList } from 'shared/leUtils/Licenses';
   import { constantsTranslationMixin } from 'shared/mixins';
   import { findLicense } from 'shared/utils/helpers';
+  import DropdownWrapper from 'shared/views/form/DropdownWrapper';
 
   export default {
     name: 'LicenseDropdown',
     components: {
+      DropdownWrapper,
       InfoModal,
     },
     filters: {},
@@ -181,8 +185,4 @@
 
 <style lang="less" scoped>
 
-  .license-container {
-    position: relative;
-  }
-
 </style>
diff --git a/contentcuration/contentcuration/frontend/shared/views/VisibilityDropdown.vue b/contentcuration/contentcuration/frontend/shared/views/VisibilityDropdown.vue
index 1b848c2f36..c85d5935ca 100644
--- a/contentcuration/contentcuration/frontend/shared/views/VisibilityDropdown.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/VisibilityDropdown.vue
@@ -1,52 +1,54 @@
 <template>
 
-  <VLayout grid wrap align-center class="role-visibility-container">
-    <VSelect
-      ref="visibility"
-      v-model="role"
-      :items="roles"
-      :label="$tr('labelText')"
-      :placeholder="placeholder"
-      color="primary"
-      :disabled="disabled"
-      :readonly="readonly"
-      :required="required"
-      :rules="rules"
-      :menu-props="{ offsetY: true, lazy: true, zIndex: 4 }"
-      box
-      :attach="$attrs.id ? `#${$attrs.id}` : '.role-visibility-container'"
-      @focus="$emit('focus')"
-    >
-      <template #append-outer>
-        <InfoModal :header="$tr('visibilityHeader')" :items="roles">
-          <p>{{ $tr('visibilityDescription') }}</p>
-          <template #header="{ item }">
-            <span>
-              {{ item.text }}
-              <Icon v-if="roleIcon(item.value)" :color="roleColor(item.value)">
-                {{ roleIcon(item.value) }}
-              </Icon>
-            </span>
-          </template>
-          <template #description="{ item }">
-            {{ $tr(item.value) }}
-          </template>
-        </InfoModal>
-      </template>
-      <template #selection="{ item }">
-        <Icon v-if="roleIcon(item.value)" :color="roleColor(item.value)" class="pr-2">
-          {{ roleIcon(item.value) }}
-        </Icon>
-        {{ item.text }}
-      </template>
-      <template #item="{ item }">
-        <Icon v-if="roleIcon(item.value)" :color="roleColor(item.value)" class="pr-2">
-          {{ roleIcon(item.value) }}
-        </Icon>
-        {{ item.text }}
-      </template>
-    </VSelect>
-  </VLayout>
+  <DropdownWrapper component="VLayout" grid wrap align-center>
+    <template #default="{ attach, menuProps }">
+      <VSelect
+        ref="visibility"
+        v-model="role"
+        :items="roles"
+        :label="$tr('labelText')"
+        :placeholder="placeholder"
+        color="primary"
+        :disabled="disabled"
+        :readonly="readonly"
+        :required="required"
+        :rules="rules"
+        :menu-props="{ ...menuProps, zIndex: 4 }"
+        box
+        :attach="attach"
+        @focus="$emit('focus')"
+      >
+        <template #append-outer>
+          <InfoModal :header="$tr('visibilityHeader')" :items="roles">
+            <p>{{ $tr('visibilityDescription') }}</p>
+            <template #header="{ item }">
+              <span>
+                {{ item.text }}
+                <Icon v-if="roleIcon(item.value)" :color="roleColor(item.value)">
+                  {{ roleIcon(item.value) }}
+                </Icon>
+              </span>
+            </template>
+            <template #description="{ item }">
+              {{ $tr(item.value) }}
+            </template>
+          </InfoModal>
+        </template>
+        <template #selection="{ item }">
+          <Icon v-if="roleIcon(item.value)" :color="roleColor(item.value)" class="pr-2">
+            {{ roleIcon(item.value) }}
+          </Icon>
+          {{ item.text }}
+        </template>
+        <template #item="{ item }">
+          <Icon v-if="roleIcon(item.value)" :color="roleColor(item.value)" class="pr-2">
+            {{ roleIcon(item.value) }}
+          </Icon>
+          {{ item.text }}
+        </template>
+      </VSelect>
+    </template>
+  </DropdownWrapper>
 
 </template>
 
@@ -55,6 +57,7 @@
   import Roles, { RolesList } from 'shared/leUtils/Roles';
   import InfoModal from 'shared/views/InfoModal.vue';
   import { constantsTranslationMixin } from 'shared/mixins';
+  import DropdownWrapper from 'shared/views/form/DropdownWrapper';
 
   const roleIcons = { coach: 'local_library' };
   const roleColors = { coach: 'roleVisibilityCoach' };
@@ -62,6 +65,7 @@
   export default {
     name: 'VisibilityDropdown',
     components: {
+      DropdownWrapper,
       InfoModal,
     },
     mixins: [constantsTranslationMixin],
diff --git a/contentcuration/contentcuration/frontend/shared/views/channel/ChannelSharing.vue b/contentcuration/contentcuration/frontend/shared/views/channel/ChannelSharing.vue
index 7283df9603..0488f0f5cf 100644
--- a/contentcuration/contentcuration/frontend/shared/views/channel/ChannelSharing.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/channel/ChannelSharing.vue
@@ -26,20 +26,24 @@
             @input="error = null"
           />
         </VFlex>
-        <VFlex shrink>
-          <VSelect
-            v-model="shareMode"
-            box
-            color="primary"
-            menu-props="offsetY"
-            :items="permissions"
-            item-value="id"
-            item-text="text"
-            style="max-width: 200px;"
-            single-line
-            hide-details
-          />
-        </VFlex>
+        <DropdownWrapper component="VFlex" shrink :menuHeight="120">
+          <template #default="{ attach, menuProps }">
+            <VSelect
+              v-model="shareMode"
+              box
+              color="primary"
+              menu-props="offsetY"
+              :items="permissions"
+              item-value="id"
+              item-text="text"
+              style="max-width: 200px;"
+              single-line
+              hide-details
+              :attach="attach"
+              :menuProps="menuProps"
+            />
+          </template>
+        </DropdownWrapper>
       </VLayout>
       <VBtn color="primary" type="submit" :disabled="sharing">
         {{ $tr('inviteButton') }}
@@ -63,10 +67,12 @@
   import ChannelSharingTable from './ChannelSharingTable';
   import LoadingText from 'shared/views/LoadingText';
   import { SharingPermissions } from 'shared/constants';
+  import DropdownWrapper from 'shared/views/form/DropdownWrapper';
 
   export default {
     name: 'ChannelSharing',
     components: {
+      DropdownWrapper,
       LoadingText,
       ChannelSharingTable,
     },
diff --git a/contentcuration/contentcuration/frontend/shared/views/errors/TechnicalTextBlock.vue b/contentcuration/contentcuration/frontend/shared/views/errors/TechnicalTextBlock.vue
index 8e6268c4fc..79e81962f5 100644
--- a/contentcuration/contentcuration/frontend/shared/views/errors/TechnicalTextBlock.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/errors/TechnicalTextBlock.vue
@@ -18,6 +18,7 @@
     <pre ref="textBox" class="hidden-screen-only">{{ text }}</pre>
     <div>
       <KButton
+        v-if="clipboardAvailable"
         ref="copyButton"
         :style="{ marginTop: '8px', marginBottom: '8px' }"
         :primary="false"
@@ -60,19 +61,24 @@
           minHeight: `${this.minHeight}px`,
         };
       },
+      clipboardAvailable() {
+        return Boolean(navigator.clipboard);
+      },
     },
     methods: {
       copyError() {
-        navigator.clipboard
-          .writeText(this.formattedText)
-          .then(() => {
-            this.$store.dispatch('showSnackbar', {
-              text: this.$tr('copiedToClipboardConfirmation'),
+        if (this.clipboardAvailable) {
+          navigator.clipboard
+            .writeText(this.formattedText)
+            .then(() => {
+              this.$store.dispatch('showSnackbar', {
+                text: this.$tr('copiedToClipboardConfirmation'),
+              });
+            })
+            .catch(() => {
+              this.$store.dispatch('showSnackbar', { text: this.$tr('copiedToClipboardFailure') });
             });
-          })
-          .catch(() => {
-            this.$store.dispatch('showSnackbar', { text: this.$tr('copiedToClipboardFailure') });
-          });
+        }
       },
     },
     $trs: {
diff --git a/contentcuration/contentcuration/frontend/shared/views/form/ContentDefaults.vue b/contentcuration/contentcuration/frontend/shared/views/form/ContentDefaults.vue
index 12a1cb32a0..96999b3fc1 100644
--- a/contentcuration/contentcuration/frontend/shared/views/form/ContentDefaults.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/form/ContentDefaults.vue
@@ -41,14 +41,19 @@
         data-name="copyrightHolder"
         :label="$tr('copyrightHolder')"
       />
-      <VSelect
-        v-model="license"
-        box
-        data-name="license"
-        :items="licenseOpts"
-        :label="$tr('license')"
-        menuProps="offsetY"
-      />
+      <DropdownWrapper>
+        <template #default="{ attach, menuProps }">
+          <VSelect
+            v-model="license"
+            box
+            data-name="license"
+            :items="licenseOpts"
+            :label="$tr('license')"
+            :attach="attach"
+            :menuProps="menuProps"
+          />
+        </template>
+      </DropdownWrapper>
       <VTextarea
         v-if="isCustomLicense"
         v-model="licenseDescription"
@@ -104,6 +109,7 @@
   import { LicensesList } from 'shared/leUtils/Licenses';
   import { ContentDefaults, ContentDefaultsDefaults } from 'shared/constants';
   import { findLicense } from 'shared/utils/helpers';
+  import DropdownWrapper from 'shared/views/form/DropdownWrapper';
 
   function normalizeContentDefaults(contentDefaults) {
     return Object.entries(ContentDefaultsDefaults).reduce((normalized, [key, defaultValue]) => {
@@ -136,6 +142,7 @@
   export default {
     name: 'ContentDefaults',
     components: {
+      DropdownWrapper,
       Checkbox,
     },
     mixins: [constantsTranslationMixin],
diff --git a/contentcuration/contentcuration/frontend/shared/views/form/CountryField.vue b/contentcuration/contentcuration/frontend/shared/views/form/CountryField.vue
index 6c09e8977a..69990ed980 100644
--- a/contentcuration/contentcuration/frontend/shared/views/form/CountryField.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/form/CountryField.vue
@@ -1,28 +1,36 @@
 <template>
 
-  <VAutocomplete
-    v-model="locations"
-    :items="options"
-    :label="label || $tr('locationLabel')"
-    :multiple="multiple"
-    :box="box"
-    item-value="id"
-    item-text="name"
-    :required="required"
-    :rules="rules"
-    :search-input.sync="searchInput"
-    :no-data-text="$tr('noCountriesFound')"
-    :chips="multiple"
-    clearable
-    v-bind="$attrs"
-    @change="searchInput = ''"
-  />
+  <DropdownWrapper>
+    <template #default="{ attach, menuProps }">
+      <VAutocomplete
+        v-model="locations"
+        :items="options"
+        :label="label || $tr('locationLabel')"
+        :multiple="multiple"
+        :box="box"
+        item-value="id"
+        item-text="name"
+        :required="required"
+        :rules="rules"
+        :search-input.sync="searchInput"
+        :no-data-text="$tr('noCountriesFound')"
+        :chips="multiple"
+        :attach="attach"
+        :menuProps="menuProps"
+        clearable
+        v-bind="$attrs"
+        @change="searchInput = ''"
+      />
+    </template>
+  </DropdownWrapper>
 
 </template>
 
 
 <script>
 
+  import DropdownWrapper from 'shared/views/form/DropdownWrapper';
+
   var countries = require('i18n-iso-countries');
   countries.registerLocale(require('i18n-iso-countries/langs/en.json'));
   countries.registerLocale(require('i18n-iso-countries/langs/es.json'));
@@ -32,6 +40,9 @@
 
   export default {
     name: 'CountryField',
+    components: { DropdownWrapper },
+    // $attrs are rebound to a descendent component
+    inheritAttrs: false,
     props: {
       value: {
         type: [String, Array],
diff --git a/contentcuration/contentcuration/frontend/shared/views/form/DropdownWrapper.vue b/contentcuration/contentcuration/frontend/shared/views/form/DropdownWrapper.vue
new file mode 100644
index 0000000000..75d19abef6
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/shared/views/form/DropdownWrapper.vue
@@ -0,0 +1,93 @@
+<template>
+
+  <component :is="component" :id="id" style="position: relative" v-bind="$attrs">
+    <slot name="default" :attach="`#${id}`" :menuProps="menuProps"></slot>
+  </component>
+
+</template>
+
+<script>
+
+  import { v4 as uuidv4 } from 'uuid';
+  import { animationThrottle } from 'shared/utils/helpers';
+
+  /**
+   * Wrapper component that defines an ID for using with Vuetify's `:attach` so that
+   * absolute positioned dropdowns will remain attached next to the wrapped field/component
+   */
+  export default {
+    name: 'DropdownWrapper',
+    props: {
+      id: {
+        type: String,
+        default() {
+          return `DropdownWrapper_${uuidv4()
+            .split('-')
+            .pop()}`;
+        },
+      },
+      component: {
+        type: String,
+        default: 'div',
+      },
+      menuHeight: {
+        type: Number,
+        default: 300,
+      },
+    },
+    data() {
+      return {
+        top: false,
+      };
+    },
+    computed: {
+      menuProps() {
+        return {
+          offsetY: true,
+          zIndex: 4,
+          top: this.top,
+          maxHeight: this.menuHeight,
+          lazy: true,
+        };
+      },
+    },
+    /**
+     * TODO: this logic doesn't handle if the page is resized, which could occur
+     * from viewport rotation on a tablet
+     */
+    mounted() {
+      let scrollableAncestor = this.$el;
+
+      // Go upwards in the DOM finding the nearest ancestor that's scrollable
+      // Note: it ideally it should be `<= 0` instead of `<= 1`
+      while (
+        scrollableAncestor &&
+        (scrollableAncestor.scrollHeight - scrollableAncestor.clientHeight <= 1 ||
+          !/auto|scroll/.test(window.getComputedStyle(scrollableAncestor).overflowY))
+      ) {
+        if (!scrollableAncestor.parentNode) {
+          break;
+        }
+        scrollableAncestor = scrollableAncestor.parentNode;
+
+        // Stop if we reach the body-- tagName is likely uppercase
+        if (/body/i.test(scrollableAncestor.tagName)) {
+          break;
+        }
+      }
+
+      const scrollableBoundingRect = scrollableAncestor.getBoundingClientRect();
+
+      // Listen for scrolls and update `top` according to whether there's enough space to render
+      // the dropdown below the element
+      const scrollListener = animationThrottle(() => {
+        this.top =
+          this.$el.getBoundingClientRect().bottom + this.menuHeight > scrollableBoundingRect.bottom;
+      });
+      scrollableAncestor.addEventListener('scroll', scrollListener);
+      // call the scroll listener to initialize `top`
+      scrollListener();
+    },
+  };
+
+</script>
diff --git a/contentcuration/contentcuration/frontend/shared/views/form/MultiSelect.vue b/contentcuration/contentcuration/frontend/shared/views/form/MultiSelect.vue
index 0f61486f68..ae6e13eb78 100644
--- a/contentcuration/contentcuration/frontend/shared/views/form/MultiSelect.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/form/MultiSelect.vue
@@ -1,30 +1,35 @@
 <template>
 
-  <VSelect
-    v-model="selections"
-    :items="items"
-    multiple
-    :box="box"
-    clearable
-    chips
-    :no-data-text="$tr('noItemsFound')"
-    :menu-props="menuProps"
-    v-bind="$attrs"
-    @click.stop.prevent
-  >
-    <template #selection="{ item }">
-      <VChip :class="{ notranslate }">
-        {{ getText(item) }}
-      </VChip>
-    </template>
-    <template #item="{ item, tile }">
-      <Checkbox v-bind="tile.props" class="ma-0">
-        <template #label>
-          <span :class="{ notranslate }">{{ getText(item) }}</span>
+  <DropdownWrapper :menuHeight="270">
+    <template #default="{ attach, menuProps }">
+      <VSelect
+        v-model="selections"
+        :items="items"
+        multiple
+        :box="box"
+        clearable
+        chips
+        :no-data-text="$tr('noItemsFound')"
+        :menu-props="{ ...menuProps, zIndex: 300 }"
+        :attach="attach"
+        v-bind="$attrs"
+        @click.stop.prevent
+      >
+        <template #selection="{ item }">
+          <VChip :class="{ notranslate }">
+            {{ getText(item) }}
+          </VChip>
+        </template>
+        <template #item="{ item, tile }">
+          <Checkbox v-bind="tile.props" class="ma-0">
+            <template #label>
+              <span :class="{ notranslate }">{{ getText(item) }}</span>
+            </template>
+          </Checkbox>
         </template>
-      </Checkbox>
+      </VSelect>
     </template>
-  </VSelect>
+  </DropdownWrapper>
 
 </template>
 
@@ -32,10 +37,13 @@
 <script>
 
   import Checkbox from './Checkbox';
+  import DropdownWrapper from './DropdownWrapper';
 
   export default {
     name: 'MultiSelect',
-    components: { Checkbox },
+    components: { Checkbox, DropdownWrapper },
+    // $attrs are rebound to a descendent component
+    inheritAttrs: false,
     props: {
       value: {
         type: Array,
@@ -51,8 +59,7 @@
       },
       itemText: {
         type: [String, Function],
-        required: false,
-        default: '',
+        required: true,
       },
       notranslate: {
         type: Boolean,
@@ -72,9 +79,6 @@
           this.$emit('input', value.filter(Boolean));
         },
       },
-      menuProps() {
-        return { offsetY: true, maxHeight: 270, zIndex: 300 };
-      },
     },
     methods: {
       getText(item) {
diff --git a/contentcuration/contentcuration/frontend/shared/vuex/channel/mutations.js b/contentcuration/contentcuration/frontend/shared/vuex/channel/mutations.js
index 720ad3db84..6ff4c501e0 100644
--- a/contentcuration/contentcuration/frontend/shared/vuex/channel/mutations.js
+++ b/contentcuration/contentcuration/frontend/shared/vuex/channel/mutations.js
@@ -51,9 +51,10 @@ export function UPDATE_CHANNEL(state, { id, content_defaults = {}, ...payload }
     });
   }
 }
+
 export function UPDATE_CHANNEL_FROM_INDEXEDDB(state, { id, ...mods }) {
   if (id && state.channelsMap[id]) {
-    applyMods(state.channelsMap[id], mods);
+    Vue.set(state.channelsMap, id, { ...applyMods(state.channelsMap[id], mods) });
   }
 }
 
diff --git a/contentcuration/contentcuration/frontend/shared/vuex/file/mutations.js b/contentcuration/contentcuration/frontend/shared/vuex/file/mutations.js
index 03d034168f..e7546cbe6e 100644
--- a/contentcuration/contentcuration/frontend/shared/vuex/file/mutations.js
+++ b/contentcuration/contentcuration/frontend/shared/vuex/file/mutations.js
@@ -4,17 +4,15 @@ import { applyMods } from 'shared/data/applyRemoteChanges';
 
 function updateFileMaps(state, file) {
   if (file.assessment_item) {
-    Vue.set(
-      state.assessmentItemFilesMap,
-      file.assessment_item,
-      mergeMapItem(state.assessmentItemFilesMap[file.assessment_item] || {}, file)
-    );
+    if (!state.assessmentItemFilesMap[file.assessment_item]) {
+      Vue.set(state.assessmentItemFilesMap, file.assessment_item, {});
+    }
+    Vue.set(state.assessmentItemFilesMap[file.assessment_item], file.id, file);
   } else if (file.contentnode) {
-    Vue.set(
-      state.contentNodeFilesMap,
-      file.contentnode,
-      mergeMapItem(state.contentNodeFilesMap[file.contentnode] || {}, file)
-    );
+    if (!state.contentNodeFilesMap[file.contentnode]) {
+      Vue.set(state.contentNodeFilesMap, file.contentnode, {});
+    }
+    Vue.set(state.contentNodeFilesMap[file.contentnode], file.id, file);
   }
 }
 
@@ -36,7 +34,7 @@ export function ADD_FILES(state, files = []) {
 
 export function UPDATE_FILE_FROM_INDEXEDDB(state, { id, ...mods }) {
   if (id && state.fileUploadsMap[id]) {
-    applyMods(state.fileUploadsMap[id], mods);
+    Vue.set(state.fileUploadsMap, id, { ...applyMods(state.fileUploadsMap[id], mods) });
     updateFileMaps(state, state.fileUploadsMap[id]);
   }
 }
diff --git a/contentcuration/contentcuration/frontend/shared/vuex/file/utils.js b/contentcuration/contentcuration/frontend/shared/vuex/file/utils.js
index 64c9b900c8..0b8e3c3524 100644
--- a/contentcuration/contentcuration/frontend/shared/vuex/file/utils.js
+++ b/contentcuration/contentcuration/frontend/shared/vuex/file/utils.js
@@ -92,7 +92,7 @@ export function extractMetadata(file, preset = null) {
     const mediaElement = document.createElement(isVideo ? 'video' : 'audio');
     // Add a listener to read the metadata once it has loaded.
     mediaElement.addEventListener('loadedmetadata', () => {
-      metadata.duration = Math.ceil(mediaElement.duration);
+      metadata.duration = Math.floor(mediaElement.duration);
       // Override preset based off video resolution
       if (isVideo) {
         metadata.preset =
diff --git a/contentcuration/contentcuration/frontend/shared/vuex/session/index.js b/contentcuration/contentcuration/frontend/shared/vuex/session/index.js
index db10e2ead0..d89a56e6d5 100644
--- a/contentcuration/contentcuration/frontend/shared/vuex/session/index.js
+++ b/contentcuration/contentcuration/frontend/shared/vuex/session/index.js
@@ -48,7 +48,7 @@ export default {
     },
     UPDATE_SESSION_FROM_INDEXEDDB(state, { id, ...mods }) {
       if (id === state.currentUser.id) {
-        applyMods(state.currentUser, mods);
+        state.currentUser = { ...applyMods(state.currentUser, mods) };
       }
     },
     REMOVE_SESSION(state) {
diff --git a/contentcuration/contentcuration/management/commands/loadconstants.py b/contentcuration/contentcuration/management/commands/loadconstants.py
index d11bee7108..8451359db6 100644
--- a/contentcuration/contentcuration/management/commands/loadconstants.py
+++ b/contentcuration/contentcuration/management/commands/loadconstants.py
@@ -135,7 +135,7 @@ def get_dict(self, constant):
         "fields": {
             "id": 2,
             "name": "Kolibri Studio (Debug Mode)",
-            "domain": "127.0.0.1:8000",
+            "domain": "127.0.0.1:8080",
         },
     },
     {
@@ -143,8 +143,17 @@ def get_dict(self, constant):
         "pk": "id",
         "fields": {
             "id": 3,
-            "name": "Kolibri Studio (Develop)",
-            "domain": "develop.contentworkshop.learningequality.org",
+            "name": "Kolibri Studio (Develop/Unstable)",
+            "domain": "unstable.studio.learningequality.org",
+        },
+    },
+    {
+        "model": Site,
+        "pk": "id",
+        "fields": {
+            "id": 4,
+            "name": "Kolibri Studio (Hotfixes)",
+            "domain": "hotfixes.studio.learningequality.org",
         },
     },
 ]
diff --git a/contentcuration/contentcuration/models.py b/contentcuration/contentcuration/models.py
index 0e26e36c86..2b9aea4224 100644
--- a/contentcuration/contentcuration/models.py
+++ b/contentcuration/contentcuration/models.py
@@ -1,4 +1,3 @@
-import functools
 import hashlib
 import json
 import logging
@@ -1105,20 +1104,6 @@ class Meta:
         unique_together = ['tag_name', 'channel']
 
 
-def delegate_manager(method):
-    """
-    Delegate method calls to base manager, if exists.
-    """
-
-    @functools.wraps(method)
-    def wrapped(self, *args, **kwargs):
-        if self._base_manager:
-            return getattr(self._base_manager, method.__name__)(*args, **kwargs)
-        return method(self, *args, **kwargs)
-
-    return wrapped
-
-
 class License(models.Model):
     """
     Normalize the license of ContentNode model
diff --git a/contentcuration/contentcuration/production_settings.py b/contentcuration/contentcuration/production_settings.py
index e314ec98bb..da6a199125 100644
--- a/contentcuration/contentcuration/production_settings.py
+++ b/contentcuration/contentcuration/production_settings.py
@@ -12,8 +12,6 @@
 
 MEDIA_ROOT = base_settings.STORAGE_ROOT
 
-SITE_ID = int(get_secret("SITE_ID") or "1")
-
 DEFAULT_FILE_STORAGE = 'contentcuration.utils.gcs_storage.GoogleCloudStorage'
 SESSION_ENGINE = "django.contrib.sessions.backends.db"
 
diff --git a/contentcuration/contentcuration/settings.py b/contentcuration/contentcuration/settings.py
index bd857d651b..b9c3a73ca1 100644
--- a/contentcuration/contentcuration/settings.py
+++ b/contentcuration/contentcuration/settings.py
@@ -291,6 +291,11 @@ def gettext(s):
     # ('en-PT', gettext('English - Pirate')),
 )
 
+SITE_BY_ID = {
+    'master': 1,
+    'unstable': 3,
+    'hotfixes': 4,
+}
 
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/1.8/howto/static-files/
@@ -310,7 +315,7 @@ def gettext(s):
 
 ACCOUNT_ACTIVATION_DAYS = 7
 REGISTRATION_OPEN = True
-SITE_ID = 1
+SITE_ID = SITE_BY_ID.get(os.getenv('BRANCH_ENVIRONMENT'), 1)
 
 # Used for serializing datetime objects.
 DATE_TIME_FORMAT = "%Y-%m-%d %H:%M:%S"
diff --git a/contentcuration/contentcuration/static/feature_flags.json b/contentcuration/contentcuration/static/feature_flags.json
index ac96fbad2f..605261b96f 100644
--- a/contentcuration/contentcuration/static/feature_flags.json
+++ b/contentcuration/contentcuration/static/feature_flags.json
@@ -8,11 +8,6 @@
       "title": "Test development feature",
       "description": "This no-op feature flag is excluded from non-dev environments",
       "$env": "development"
-    },
-    "channel_quizzes": {
-      "type": "boolean",
-      "title": "Channel quizzes",
-      "description": "Allows an exercise to be marked as a channel quiz"
     }
   },
   "examples": [
diff --git a/contentcuration/contentcuration/static/img/le-logo-web.png b/contentcuration/contentcuration/static/img/le-logo-web.png
new file mode 100644
index 0000000000..f58cfc662f
Binary files /dev/null and b/contentcuration/contentcuration/static/img/le-logo-web.png differ
diff --git a/contentcuration/contentcuration/templates/permissions/permissions_email.html b/contentcuration/contentcuration/templates/permissions/permissions_email.html
index c3342b810c..21f3410bc0 100644
--- a/contentcuration/contentcuration/templates/permissions/permissions_email.html
+++ b/contentcuration/contentcuration/templates/permissions/permissions_email.html
@@ -79,8 +79,7 @@
         		color: #915194;
         	}
         	.message-signature-img{
-        		width:24px;
-        		margin-right:10px;
+        		width:145px;
         		cursor:pointer;
         	}
         	.message-signature p{
@@ -114,9 +113,13 @@ <h3>{% translate "Hello" %} <strong>{% if is_new %}{{ user.email }}{% else %}{{
 			</div>
 		</div>
 		<div class="message-signature">
-		<p>{% translate "Thanks for using our site!" %}</p>
-
-		<p><a href="https://learningequality.org/" target="_blank"><img src="data:image/png;base64,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" class="message-signature-img"></a> <strong>The Learning Equality Team</strong></p>
+          <p>
+            {% translate "Thanks for using our site!" %}<br>
+            <strong>{% translate "The Learning Equality Team" %}</strong>
+          </p>
+          <a href="https://learningequality.org/" target="_blank">
+            <img src="{{ domain }}/static/img/le-logo-web.png" class="message-signature-img" />
+          </a>
 		</div>
 		{% endautoescape %}
 	</body>
diff --git a/contentcuration/contentcuration/templates/registration/activation_email.html b/contentcuration/contentcuration/templates/registration/activation_email.html
index 2a903797ee..3dd4bd23b8 100644
--- a/contentcuration/contentcuration/templates/registration/activation_email.html
+++ b/contentcuration/contentcuration/templates/registration/activation_email.html
@@ -77,8 +77,7 @@
         		color:white;
         	}
         	.message-signature-img{
-        		width:24px;
-        		margin-right:10px;
+        		width:145px;
         		cursor:pointer;
         	}
         	.message-signature p{
@@ -107,9 +106,13 @@ <h3>{% translate "Hello" %} <strong>{{ user.first_name }}</strong>,</h3>
 			</div>
 		</div>
 		<div class="message-signature">
-		<p>{% translate "Thanks for using our site!" %}</p>
-
-		<p><a href="https://learningequality.org/" target="_blank"><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAHgAAAB4CAYAAAA5ZDbSAAAPS0lEQVR4Xu2de1QTVxrA78SEt7xEASFB8AWogYov0LZatb5abRXRaltXt5W6PS12257qdte13froqV3Ubk+1j63tVlsFrJ5aH2fXVqsGUFsJL0UBIYEo8pbwEEjunrHGk0km4c7MzUwShz/he93vN9+db+6dOxBA/HHrDBBuPTpxcEAE7OYXgQhYBOzmGXDz4YkVLAJ28wy4+fDEChYBu3kG3Hx4YgWLgN08AzwOr6G7e2KIh0c+jy7FhQ6+kp2mUj8DANg3OSRoQ8YIxT/48itO0TxkelluYWUvhNEmVwdSEnjLO2+OeMijU7pIU6mhZWCTQwJBxogoXnLPixOnzDwPQdHB5buKRcAOAN0F4cjncwuv2DP9ZtywseODfC85wD3FpAjYARm2V7kmd+kxEbemh4WEOsC9CNhRSd15VZN7tqF5Eqp9PpotsYJRafQh9+GVKpjf1MrImgiYUbqEE0aZkumiEwELxwzZM1u4pAMRMHKa+RdcV1gdVKlvaWLrOTUy9HqaIizGnv5GCCXP6jtyhvX3fZqtH/EezCJz19r0mW8XVaxloXpfJXPsyNgIL68yWzYKWtrSN5dW7uJa6SJghpTSzqm/BQRYylDNStze9Pzl9Zqfj91onGquxHY6FwEzILXqfDHU9xoYaNCLQgj3ZE1OXEn31xcvFMPWHmsfGx8aMSTe27uaqXMRMGLGuDRTli5sVWNfPthUsQgYAXBfiUcwcV/kmwnKVR5S4ktLHRQfImAmmUaURUk8oilgJIi52cnKY2zgsm22xAq2QWdDUcW8K236I6jwEOSWHUhJ+NZcbnneNf8eYwfy8pdYwQhZRhH5ua4RflJRgyKKJPOX2Oj1icH+W82Fcxta8jKvVk9EMnBPSATMJFs2ZBer1DcIAMIwmLprgg7K0lz1GSMEU5j6EAEzzZiF/FKVGho52jBXpwOyMr8YthvYPWqJgDnAwdlMAQi6DkxO8GbbTNkahgiYBeCC5rZpmy9X/sRClVYlKcgfvBUXTWleIYTyJbmFGq4+RMAMM5iWVzANGAlscMO8Pf+686HYTeZhrL6o82nprm9nGJqV+EAv2ZCPx8aLK1moiXzxQnFra4/BH1W+L7npofLA9KHBlEeeryt1vxy5Wf9wX7oof7dVvYdr6l5aEBl6d1OC7ueBfA7+Q34R7DDga6fokp9ZVgVzG5Efce0yDvL0mL87Ke4Hq3t6blEagMb9trp18vcPHGCszZSNx6AlKjW0ehkapUxpZEI9PcBHSXFWnFbmF3e2GwxeJhVbFf5AAcYJV0IA8F2y9QkFnD5sVeaK/CLYSTMD0UF+YADjTTysOpCSeP8oiqmK8PqgXyRh+jI9J8Dn6zsfff5MAxgkI0413Pn9nuYhAeCDCSHl2k7DC6uG9z/NcmbCpna4pi5rr+ZmKi6Dw/188jYphyeb26tsb//jOnX557h8DPPzKd+sHD7c6p5LcwzGXAYCeCorJXGa+e8YA/5P+e03thS0fMBkMHI/6fYTswe/xkQHh+xilTqLAAAb3NUxkWtnhA3YYR5bmkq9GQCwHke8d21AkHpgckKOub116qvPVLZ37kPxYTlNIwNecaY+6UJd50UUJ7ZkAj0lBaonIx/iYgNVF/eyIwGIQ/tTlJSX3zYUlbdcaWsPQI2pL7nd45SJQR6E2lzuqK7+0p4qXWJfuraaLSTA8dkaXE3h3TimDJH7fjqO6EANmqkc7nsh6V8mIX7cO0n5hCkW3D7oGiQ2PhhVcHUXjJlzRFvBNMEo8qtH9t+5dkxQBoosqszRxkb/PWU1eB4+aZwuiAx9arki7DCbxNsag5QgwL5kpVWhPZOrhgYWZYUMePShWrmx18B5/dQenJj+suwjs8IXowK0J9fe2/vxyvMlf8Jhiy8bMoIAe2ngcrmAkADvvtyi3lFyW8nHQAsXys9KJQSn5bwlqoLdEBCr+YgXmw9IrD4wWfmZpT0ucP2k/cC/J4ymzAbWKySn62B+/R1s40Ax9N4kecjCSKIRRdZSZn3hVVih72SjKpjOy0Pl2x4NDX7TPIC3SyujrrW0VXEJanpo0HfpQxXkt0Du/1gB7jbAVxK/1+7k4oiNbmmqAqnhM7fN5WpnEyMOHbpm6oXzJXtv9/Yu42ofeSXrudO35v5a3/UjV4dM9ZlAdhe4r18qg9rOLqapopVHBkxqf1nWCj8oclhDanNAKJDdBS7OcbDabJh6pAbe6sK3rYZymUIIyy4vjoqlk329oGyKtqPrDIodZ5GJ8PI0ZI6NlZrHAyEMWpJbyPpkouXYvCXEuK8mKX+lG3Of971R2RpsW1+oSZ+v8M3bOmEAZb03VVWQLgGEzY1tVNt8yskIsGtvcsIac5+LL1YEEN36FlxxpAwIyFs7cgglV3abLDrHuFeyUAbXK5EkXl0YSVm2wzmlocTARebZ6MFT54cPpGy27Kmq/faoroHzyURTXG/FDilPCg6w2pRgDJhUEAKy5f34rYqKgOt1+K5+LgDt6dLdD9l8w8OeD7pXhFhN0SalXWX6hJ1FTQWOSootu5aQzzU0F+24qhnNdxxM/FkCXpqrhkYWy462fDJ5u7LPe7C5k7gczSMEBLzv8VpCXqpS5xsBmMAk6XzKmgPAfVthApccMyPApELCQe2VHiMcyWfC/GUSkLcgkhKrrddW+IzLnq9Bnh7g1p1urOEwhcsK8O+QNbCH36cnEOAhAbnzqZBxVwdWGhiNRft6d7yfMMLX3CSE0H9UjraVfIOmYKHtVUDGFWxyIkTTBQEx73Kq/Kj5QN0dMgRwfVZKIuVkYvIPNya03um5/2HxjUlBU9Oi6V+PYg1YqM7660cGvTpukNdHDwLkXUmxy4I9PSlnij+90npme3Gr1clEWyuAnABDCAeMytE2YJyNkExZDmbxb9cGEl0dt5CUXURoerLSI50geszDjc/WaAEAkXRDcAhgIadrywF9UVmjPnGzkZc9bEdeIxIAwHc0X4Qfna3p82grHWROFWwa6KZLzVl7K9qwvb2ImkDLAb1XUgELW/Wo6k4nR8LYTwMXtd9xGGAyU7HZ1TskgHiV56x1lKYqKN0lzmMjfI4lNXIQSFOEUwpOB6HPjBwt8slEhwIWqumaE+nT/eGkEE9XbrqWR4V9siAi1Op9MtTKNY3d4YBJR0LsPkX5SV87NnvwdleETLd4MfuY7htNe+9ypjMIL4CFquRuH7lX+VyC8jKZsz8j08F9VVUP/6dj944Zb4DfUEPfo9e0vHc7lgM839iasa2silLZTKvCUfJ0cJlOyZax8QaYdNzYZch4+Egt78m1HGSaSp0JAOD06V+ckL37ScBXE8dYPb1whUvGyCvgu/fjLE0mJPhPruVAV+QVtXUajX44QbGxJSWIvH3JSsrbF8oTN31727o5z3YOXeiwN9h5J3Twelsvm3yw1gnykIBzTrYxsSYmcu00i5OJWdf1m//+axOWk4mCARaq6ZJJiAL1QjnlJKNQTdfKaEX0nPAgykvtcdmafxIAYDlS+/mjA6emDPSm3afHspKFUmo47jEofsxljjwedirG34NyIJpvyHTNlDJHA3sxveER7Cm5c/bJyPvf6rDMEW+Ahark50b4D12vDKzk+xnZ1qlBnBe6jABAvcj+iRBeAQsF2fL+9E5xxaKS2/pspjMCqjwE4EpWSkKcpTxOuLa6ZkErmHS+WtU05qxOX4iaLFxylpDP3GqCH5WTu294f94ZNRTEBfg55DHIFKncVwpOzBmMVJxIQnhTAMAxbXvd6/mNg3Db7cue1TPyuYJ6QBAhfemh/n10gP+kDaOiKf/CPfaQdoykF+K8oLeVpiooJxPtxScI4HtT9TUAwDDU5OGQiw2QgYMzqTs2ay6WwsZuyr46K1d0zdQrqvrqk7pOBSuDNEonZ4dvC/eTIcMlTQgGmHQuxMt7j4R7/bZr8qAk8/ydvtWk/7hcS9l2ZAKFDu6Mo7VQ18Huu9B0vmcNlvtkphCMF6kFBSxU03VH2k9R8VQE5QZM/hu50txCRkReipEvfyws2OrzRkI0U7YuSMEBCwX50iJ5vCdBXKZLzJoLJZeae3oT6d4MlhJE6b5k5ShbCcUJVwKAoThVQTmZyGRmEXyKNgVb3NydkHbypuDHYpgmz1w+I7dh4n9rO/K42DDXfTrKB2waH8K5ADkbwDWg+OzqUQAQxbjsodpBOXDel60L9Z0XVpyuH9eXHOrf02L8/rVxbPArqPJO2UXTBTXzaG1zbYchEMfAmNiYMsQv8NNx1I95o+qPP6SF7bjWHW1s+aHGQifnNBVsCm7OcR2s1vO7+2TyvX+GfNiYQALpw2+fXb69JbOkZR2X5Fvq4phNLG06HWChmi7zxEAItl9erLDa6dmqbs48Wduxthbj44/JryPgOk2TRVcFOLtRnFWG25a/jAB5C+QOKzSHGcaRCHeH7CclWs8/JXdoz+HUgJ1husZxodLZyJw44NAsuS/l88SO8OX0gA9U6LdsvNSEtZlxRCKZ2NwyPmTKgiifc0x02Mo6PeB7VfwFAGAV20E6k56jmilbY3QJwGTwiQc1d7qNwMOZYDGJhUx0CYvvcTLx4RLPwfYG5KpNV5h3P/DTvAhBikkQp1yuSleDnBHv354eHyjYO9kuB/hnCKUv52i579BzucoQdRW+0oePzxl8FlHcIWIuB5jMQo/B8E7C97UbHJIRTEYLF8mXSwkC6V/hYHJJa8YlAZMjicuuziAAwfvZJxQYfHfK9mJyWcDkoP6cVw+P1zB+iwWFEWsZZ4JLDsKlAd97RsZ0RoA107uKPv0IcPFpx60ps43O5QE7A+QRAbJTh2aGU47IsAWCW88tAAsJed/U0PWJIZ6UL9HhhsTFntsAFgJylI9vwLG5A25zAeBoXbcC/NK5ptG/3NAXOTpppH1na6ZsjdmtAJODHH2w+gmjkbD6f/c4obsKXLfoounAfX1NP2uruuk4TqikrZkR3mBH8kCXKgqXCpYpMJzr1olB/Yfsmx5UzTQGoeXdGjCZXAOEfxuTo32XbaJlEqBTL1REsNUXWs/tAZsneMJh7Ul9D3wMJenD/WXrDj8e/j6KrDPLPFCAzUFoIfROP6F7vKrt9/NmWycOAPMVvoedGRab2B5YwGyS5Yo6ImBXpMYgZhEwg2S5oqgI2BWpMYhZBMwgWa4oKgJ2RWoMYhYBM0iWK4qKgF2RGoOYRcAMkuWKoiJgV6TGIOb/AyGhOMTtSwTKAAAAAElFTkSuQmCC" class="message-signature-img"> <strong>The Learning Equality Team</strong></a></p>
+        <p>
+		  {% translate "Thanks for using our site!" %}<br>
+          <strong>{% translate "The Learning Equality Team" %}</strong>
+        </p>
+        <a href="https://learningequality.org/" target="_blank">
+          <img src="{{ domain }}/static/img/le-logo-web.png" class="message-signature-img" />
+        </a>
 		</div>
 		{% endautoescape %}
 	</body>
diff --git a/contentcuration/contentcuration/templates/registration/password_reset_email.html b/contentcuration/contentcuration/templates/registration/password_reset_email.html
index 6390e84fcc..366b26b366 100644
--- a/contentcuration/contentcuration/templates/registration/password_reset_email.html
+++ b/contentcuration/contentcuration/templates/registration/password_reset_email.html
@@ -77,8 +77,7 @@
                 color:white;
             }
             .message-signature-img{
-                width:24px;
-                margin-right:10px;
+                width:145px;
                 cursor:pointer;
             }
             .message-signature p{
@@ -107,9 +106,13 @@ <h3>{% translate "Hello" %} <strong>{{ user.first_name }}</strong>,</h3>
             </div>
         </div>
         <div class="message-signature">
-        <p>{% translate "Thanks for using our site!" %}</p>
-
-        <p><a href="https://learningequality.org/" target="_blank"><img src="data:image/png;base64,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" class="message-signature-img"> <strong>The Learning Equality Team</strong></a></p>
+          <p>
+            {% translate "Thanks for using our site!" %}<br>
+            <strong>{% translate "The Learning Equality Team" %}</strong>
+          </p>
+          <a href="https://learningequality.org/" target="_blank">
+            <img src="{{ domain }}/static/img/le-logo-web.png" class="message-signature-img" />
+          </a>
         </div>
         {% endautoescape %}
     </body>
diff --git a/contentcuration/contentcuration/templates/registration/welcome_new_user_email.html b/contentcuration/contentcuration/templates/registration/welcome_new_user_email.html
index ff476046ab..9347e39119 100644
--- a/contentcuration/contentcuration/templates/registration/welcome_new_user_email.html
+++ b/contentcuration/contentcuration/templates/registration/welcome_new_user_email.html
@@ -55,22 +55,14 @@
           margin-top: 30px;
       }
 
-      .message-signature {
-          text-align: right;
-          position: absolute;
-          right: 5px;
-          bottom: 5px;
-      }
-
       .message-signature * {
           margin: 0;
           padding: 0;
       }
 
       .message-signature-img {
-          width: 24px;
+          width: 145px;
           cursor: pointer;
-          vertical-align: middle;
       }
 
       .note {
@@ -86,6 +78,7 @@
     <p class="message-channel-name">{% translate "Welcome to Kolibri Studio!" %}</p>
   </div>
   <div class="greeting">
+    <p>
     {% blocktranslate %}
       We're delighted to introduce you to <a href="{{ domain }}">Kolibri Studio</a>, our curricular tool to add,
       organize, and manage your own resources or those from the Kolibri Content Library.
@@ -93,25 +86,29 @@
     <a href="{{ domain }}/channels/#/public">
       {% translate "View the Kolibri Content Library" %}
     </a>
-    <br>
+    </p>
   </div>
   <div class="function-container">
+    <p>
     {% blocktranslate %}
       Using Kolibri Studio, you can explore pre-organized collections of open educational resources (OER), and bundle,
       tag, differentiate, re-order, and distribute them into custom channels.
     {% endblocktranslate %}
-    <br/>
+    </p>
+    <p>
     {% blocktranslate %}
       Using an admin account, you can then publish and import these custom channels--either your own or those shared
       with you -- into Kolibri with a unique "token" generated for each channel.
     {% endblocktranslate %}
-    <br>
+    </p>
   </div>
   <div>
+    <p>
     {% blocktranslate %}
       Browse through the list of resources below* to learn more about Kolibri Studio and to begin creating your own
       custom channels:
     {% endblocktranslate %}
+    </p>
     <ul>
       <li>
         <a href="https://kolibri-studio.readthedocs.io/en/latest/index.html">
@@ -142,7 +139,7 @@
           <li>
             <b>{% translate "Slide gif format:" %}</b>
             <a
-              href="https://docs.google.com/presentation/d/1diRou-RYk7-gYkpMCDB5zs9C7Ywo_qifH0l78nvwVCY/edit#slide=id.g8b5cff85a9_0_78"
+              href="https://docs.google.com/presentation/d/e/2PACX-1vRLHvRytsoLdOCv5EMlm5_KRKYHdtwpt_FUkC3sLeW5L12Tw9KZj5GA6klbq8dQB1nVtEBGn73GZsU9/pub?start=true&loop=true&delayms=30000&slide=id.g6b950d4fd1_0_360"
             >
               <b>{% translate "Step by step Studio tutorial" %}</b>
             </a>
@@ -164,21 +161,21 @@
     </ul>
   </div>
   <div class="footer">
-    {% translate "If you need support with Kolibri Studio, please reach out to us on our Community Forum." %}
-    <a href="https://community.learningequality.org/c/support/studio/22">
-      {% translate "Access the Community Forum" %}
-    </a>.
-    <br><br>
-    {% translate "Thank You!" %}<br>
-    <div class="message-signature">
-      <p>
-        <a href="https://learningequality.org/" target="_blank">
-          <img src="data:image/png;base64,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" class="message-signature-img">
-          <strong>{% translate "The Learning Equality Team" %}</strong>
-        </a>
-      </p>
-      <p class="note"> <em>{% translate "*resources are presented in English" %}</em></p>
-    </div>
+    <p>
+      {% translate "If you need support with Kolibri Studio, please reach out to us on our Community Forum." %}
+      <a href="https://community.learningequality.org/c/support/studio/22">
+        {% translate "Access the Community Forum" %}
+      </a>
+    </p>
+    <p>
+      {% translate "Thank You!" %}<br>
+      <strong>{% translate "The Learning Equality Team" %}</strong>
+    </p>
+    <a href="https://learningequality.org/" target="_blank">
+      <img src="{{ domain }}/static/img/le-logo-web.png" class="message-signature-img" />
+    </a>
+    <br/>
+    <p class="note"> <em>{% translate "*resources are presented in English" %}</em></p>
   </div>
 </div>
 {% endautoescape %}
diff --git a/contentcuration/contentcuration/tests/test_exportchannel.py b/contentcuration/contentcuration/tests/test_exportchannel.py
index 066792e220..291dcb5679 100644
--- a/contentcuration/contentcuration/tests/test_exportchannel.py
+++ b/contentcuration/contentcuration/tests/test_exportchannel.py
@@ -12,6 +12,7 @@
 from kolibri_content import models as kolibri_models
 from kolibri_content.router import get_active_content_database
 from kolibri_content.router import set_active_content_database
+from le_utils.constants import exercises
 from le_utils.constants.labels import accessibility_categories
 from le_utils.constants.labels import learning_activities
 from le_utils.constants.labels import levels
@@ -96,7 +97,45 @@ def setUp(self):
         new_video.parent = self.content_channel.main_tree
         new_video.save()
 
+        # Add a node to test new style mastery models.
+        extra_fields = {
+            "options": {
+                "completion_criteria": {
+                    "model": "mastery",
+                    "threshold": {
+                        "m": 1,
+                        "n": 2,
+                        "mastery_model": exercises.M_OF_N,
+                    }
+                }
+            }
+        }
+        current_exercise = cc.ContentNode.objects.filter(kind_id="exercise").first()
+
+        new_exercise = create_node({'kind_id': 'exercise', 'title': 'Mastery test', 'extra_fields': extra_fields})
+        new_exercise.complete = True
+        new_exercise.parent = current_exercise.parent
+        new_exercise.save()
+        for ai in current_exercise.assessment_items.all():
+            ai.id = None
+            ai.contentnode = new_exercise
+            ai.save()
+
         first_topic = self.content_channel.main_tree.get_descendants().first()
+
+        # Add a publishable topic to ensure it does not inherit but that its children do
+        new_node = create_node({'kind_id': 'topic', 'title': 'Disinherited topic'})
+        new_node.complete = True
+        new_node.parent = first_topic
+        new_node.save()
+
+        new_video = create_node({'kind_id': 'video', 'title': 'Inheriting video'})
+        new_video.complete = True
+        new_video.parent = new_node
+        new_video.save()
+
+        first_topic.language_id = "fr"
+
         first_topic.accessibility_labels = {
             accessibility_categories.AUDIO_DESCRIPTION: True,
         }
@@ -118,6 +157,7 @@ def setUp(self):
         first_topic.save()
 
         first_topic_first_child = first_topic.children.first()
+        first_topic_first_child.language_id = "sw"
         first_topic_first_child.accessibility_labels = {
             accessibility_categories.CAPTIONS_SUBTITLES: True,
         }
@@ -226,14 +266,37 @@ def test_channel_icon_encoding(self):
         self.assertIsNotNone(self.content_channel.icon_encoding)
 
     def test_assessment_metadata(self):
-        asm = kolibri_models.AssessmentMetaData.objects.first()
-        self.assertTrue(isinstance(json.loads(asm.assessment_item_ids), list))
-        self.assertTrue(isinstance(json.loads(asm.mastery_model), dict))
+        for i, exercise in enumerate(kolibri_models.ContentNode.objects.filter(kind="exercise")):
+            asm = exercise.assessmentmetadata.first()
+            self.assertTrue(isinstance(json.loads(asm.assessment_item_ids), list))
+            mastery = json.loads(asm.mastery_model)
+            self.assertTrue(isinstance(mastery, dict))
+            self.assertEqual(mastery["type"], exercises.DO_ALL if i == 0 else exercises.M_OF_N)
+            self.assertEqual(mastery["m"], 3 if i == 0 else 1)
+            self.assertEqual(mastery["n"], 3 if i == 0 else 2)
+
+    def test_inherited_language(self):
+        first_topic_node_id = self.content_channel.main_tree.get_descendants().first().node_id
+        for child in kolibri_models.ContentNode.objects.filter(parent_id=first_topic_node_id)[1:]:
+            if child.kind == "topic":
+                self.assertIsNone(child.lang_id)
+                self.assertEqual(child.children.first().lang_id, "fr")
+            else:
+                self.assertEqual(child.lang_id, "fr")
+
+    def test_inherited_language_no_overwrite(self):
+        first_topic_node_id = self.content_channel.main_tree.get_descendants().first().node_id
+        first_child = kolibri_models.ContentNode.objects.filter(parent_id=first_topic_node_id).first()
+        self.assertEqual(first_child.lang_id, "sw")
 
     def test_inherited_category(self):
         first_topic_node_id = self.content_channel.main_tree.get_descendants().first().node_id
         for child in kolibri_models.ContentNode.objects.filter(parent_id=first_topic_node_id)[1:]:
-            self.assertEqual(child.categories, subjects.MATHEMATICS)
+            if child.kind == "topic":
+                self.assertIsNone(child.categories)
+                self.assertEqual(child.children.first().categories, subjects.MATHEMATICS)
+            else:
+                self.assertEqual(child.categories, subjects.MATHEMATICS)
 
     def test_inherited_category_no_overwrite(self):
         first_topic_node_id = self.content_channel.main_tree.get_descendants().first().node_id
@@ -243,7 +306,11 @@ def test_inherited_category_no_overwrite(self):
     def test_inherited_needs(self):
         first_topic_node_id = self.content_channel.main_tree.get_descendants().first().node_id
         for child in kolibri_models.ContentNode.objects.filter(parent_id=first_topic_node_id)[1:]:
-            self.assertEqual(child.learner_needs, needs.PRIOR_KNOWLEDGE)
+            if child.kind == "topic":
+                self.assertIsNone(child.learner_needs)
+                self.assertEqual(child.children.first().learner_needs, needs.PRIOR_KNOWLEDGE)
+            else:
+                self.assertEqual(child.learner_needs, needs.PRIOR_KNOWLEDGE)
 
     def test_inherited_needs_no_overwrite(self):
         first_topic_node_id = self.content_channel.main_tree.get_descendants().first().node_id
@@ -264,12 +331,20 @@ def test_child_no_inherit_accessibility_label(self):
     def test_inherited_grade_levels(self):
         first_topic_node_id = self.content_channel.main_tree.get_descendants().first().node_id
         for child in kolibri_models.ContentNode.objects.filter(parent_id=first_topic_node_id):
-            self.assertEqual(child.grade_levels, levels.LOWER_SECONDARY)
+            if child.kind == "topic":
+                self.assertIsNone(child.grade_levels)
+                self.assertEqual(child.children.first().grade_levels, levels.LOWER_SECONDARY)
+            else:
+                self.assertEqual(child.grade_levels, levels.LOWER_SECONDARY)
 
     def test_inherited_resource_types(self):
         first_topic_node_id = self.content_channel.main_tree.get_descendants().first().node_id
         for child in kolibri_models.ContentNode.objects.filter(parent_id=first_topic_node_id):
-            self.assertEqual(child.resource_types, resource_type.LESSON_PLAN)
+            if child.kind == "topic":
+                self.assertIsNone(child.resource_types)
+                self.assertEqual(child.children.first().resource_types, resource_type.LESSON_PLAN)
+            else:
+                self.assertEqual(child.resource_types, resource_type.LESSON_PLAN)
 
     def test_topics_no_learning_activity(self):
         first_topic_node_id = self.content_channel.main_tree.get_descendants().first().node_id
diff --git a/contentcuration/contentcuration/tests/test_sync.py b/contentcuration/contentcuration/tests/test_sync.py
index 24b31d6c62..5948ea0d06 100644
--- a/contentcuration/contentcuration/tests/test_sync.py
+++ b/contentcuration/contentcuration/tests/test_sync.py
@@ -6,6 +6,7 @@
 from .testdata import create_temp_file
 from contentcuration.models import AssessmentItem
 from contentcuration.models import Channel
+from contentcuration.models import ContentTag
 from contentcuration.utils.publish import mark_all_nodes_as_published
 from contentcuration.utils.sync import sync_channel
 
@@ -156,3 +157,102 @@ def test_sync_assessment_item_add(self):
         self.assertEqual(target_ai.files.filter(checksum=db_file.checksum).count(), 1)
 
         self.assertTrue(self.derivative_channel.has_changes())
+
+    def test_sync_tags_add(self):
+        """
+        Test that calling sync_node_tags successfully syncs a tag added to the original node to
+        the copied node.
+        """
+
+        self.assertFalse(self.derivative_channel.has_changes())
+
+        contentnode = (
+            self.channel.main_tree.get_descendants()
+            .exclude(kind_id=content_kinds.TOPIC)
+            .first()
+        )
+
+        target_child = self.derivative_channel.main_tree.get_descendants().get(
+            source_node_id=contentnode.node_id
+        )
+
+        self.assertIsNotNone(target_child)
+        self.assertEqual(
+            target_child.tags.count(), contentnode.tags.count()
+        )
+
+        tag = ContentTag.objects.create(tag_name="tagname")
+
+        contentnode.tags.add(tag)
+
+        self.assertNotEqual(
+            target_child.tags.count(), contentnode.tags.count()
+        )
+
+        sync_channel(self.derivative_channel, sync_tags=True)
+        self.derivative_channel.main_tree.refresh_from_db()
+
+        self.assertEqual(
+            target_child.tags.count(), contentnode.tags.count()
+        )
+
+        self.assertEqual(
+            target_child.tags.filter(
+                tag_name=tag.tag_name
+            ).count(),
+            1,
+        )
+
+        self.assertTrue(self.derivative_channel.has_changes())
+
+    def test_sync_tags_add_multiple_tags(self):
+        """
+        Test that calling sync_node_tags does not raise an error when there
+        are multiple tags with the same tag_name and null channel_id.
+        """
+
+        self.assertFalse(self.derivative_channel.has_changes())
+
+        contentnode = (
+            self.channel.main_tree.get_descendants()
+            .exclude(kind_id=content_kinds.TOPIC)
+            .first()
+        )
+
+        target_child = self.derivative_channel.main_tree.get_descendants().get(
+            source_node_id=contentnode.node_id
+        )
+
+        self.assertIsNotNone(target_child)
+        self.assertEqual(
+            target_child.tags.count(), contentnode.tags.count()
+        )
+
+        # Create the same tag twice
+        ContentTag.objects.create(tag_name="tagname")
+
+        tag = ContentTag.objects.create(tag_name="tagname")
+
+        contentnode.tags.add(tag)
+
+        self.assertNotEqual(
+            target_child.tags.count(), contentnode.tags.count()
+        )
+        try:
+            sync_channel(self.derivative_channel, sync_tags=True)
+        except Exception as e:
+            self.fail("Could not run sync_channel without raising exception: {}".format(e))
+        self.derivative_channel.main_tree.refresh_from_db()
+
+        self.assertEqual(
+            target_child.tags.count(), contentnode.tags.count()
+        )
+
+        self.assertEqual(
+            target_child.tags.filter(
+                tag_name=tag.tag_name
+            ).count(),
+            1,
+        )
+
+        self.assertTrue(self.derivative_channel.has_changes())
diff --git a/contentcuration/contentcuration/tests/testdata.py b/contentcuration/contentcuration/tests/testdata.py
index 50895337b1..6d91292154 100644
--- a/contentcuration/contentcuration/tests/testdata.py
+++ b/contentcuration/contentcuration/tests/testdata.py
@@ -112,7 +112,7 @@ def node_json(data):
     return node_data
 
 
-def node(data, parent=None):
+def node(data, parent=None):  # noqa: C901
     new_node = None
     # Create topics
     if 'node_id' not in data:
@@ -155,12 +155,15 @@ def node(data, parent=None):
 
     # Create exercises
     elif data['kind_id'] == "exercise":
-        extra_fields = {
-            'mastery_model': data['mastery_model'],
-            'randomize': True,
-            'm': data.get('m') or 0,
-            'n': data.get('n') or 0
-        }
+        if "extra_fields" in data:
+            extra_fields = data["extra_fields"]
+        else:
+            extra_fields = {
+                'mastery_model': data['mastery_model'],
+                'randomize': True,
+                'm': data.get('m') or 0,
+                'n': data.get('n') or 0
+            }
         new_node = cc.ContentNode(
             kind=exercise(),
             parent=parent,
@@ -174,7 +177,7 @@ def node(data, parent=None):
         )
 
         new_node.save()
-        for assessment_item in data['assessment_items']:
+        for assessment_item in data.get('assessment_items', []):
             ai = cc.AssessmentItem(
                 contentnode=new_node,
                 assessment_id=assessment_item['assessment_id'],
diff --git a/contentcuration/contentcuration/tests/viewsets/test_file.py b/contentcuration/contentcuration/tests/viewsets/test_file.py
index 3e0fe475e2..0fa5f146a6 100644
--- a/contentcuration/contentcuration/tests/viewsets/test_file.py
+++ b/contentcuration/contentcuration/tests/viewsets/test_file.py
@@ -442,4 +442,4 @@ def test_upload_url(self):
         response = self.client.post(reverse("file-upload-url"), self.file, format="json",)
         self.assertEqual(response.status_code, 200)
         file = models.File.objects.get(checksum=self.file["checksum"])
-        self.assertEqual(11, file.duration)
+        self.assertEqual(10, file.duration)
diff --git a/contentcuration/contentcuration/utils/celery/tasks.py b/contentcuration/contentcuration/utils/celery/tasks.py
index 884d30a98a..3eb83d4180 100644
--- a/contentcuration/contentcuration/utils/celery/tasks.py
+++ b/contentcuration/contentcuration/utils/celery/tasks.py
@@ -1,3 +1,4 @@
+import logging
 import math
 import uuid
 
@@ -8,6 +9,9 @@
 from contentcuration.utils.sentry import report_exception
 
 
+logger = logging.getLogger(__name__)
+
+
 class ProgressTracker:
     """
     Helper to track task progress
@@ -174,6 +178,8 @@ def enqueue(self, user, **kwargs):
         task_id = uuid.uuid4().hex
         channel_id = kwargs.get("channel_id")
 
+        logging.info(f"Enqueuing task:id {self.name}:{task_id} for user:channel {user.pk}:{channel_id} | {kwargs}")
+
         # returns a CeleryAsyncResult
         async_result = self.apply_async(
             task_id=task_id,
@@ -205,7 +211,9 @@ def fetch_or_enqueue(self, user, **kwargs):
             if task_ids:
                 async_result = self.fetch_match(task_ids[0], **kwargs)
                 if async_result:
+                    logging.info(f"Fetched matching task {self.name} for user {user.pk} with id {async_result.id} | {kwargs}")
                     return async_result
+        logging.info(f"Didn't fetch matching task {self.name} for user {user.pk} | {kwargs}")
         return self.enqueue(user, **kwargs)
 
     def requeue(self, **kwargs):
@@ -221,6 +229,7 @@ def requeue(self, **kwargs):
         task_result = get_task_model(self, request.id)
         task_kwargs = request.kwargs.copy()
         task_kwargs.update(kwargs)
+        logging.info(f"Re-queuing task {self.name} for user {task_result.user.pk} from {request.id} | {task_kwargs}")
         return self.enqueue(task_result.user, **task_kwargs)
 
 
diff --git a/contentcuration/contentcuration/utils/nodes.py b/contentcuration/contentcuration/utils/nodes.py
index 668d5ff81d..2a1c2dad1a 100644
--- a/contentcuration/contentcuration/utils/nodes.py
+++ b/contentcuration/contentcuration/utils/nodes.py
@@ -15,6 +15,7 @@
 from django.db.models import Count
 from django.db.models import Sum
 from django.utils import timezone
+from le_utils.constants import completion_criteria
 from le_utils.constants import content_kinds
 from le_utils.constants import format_presets
 
@@ -427,3 +428,22 @@ def calculate_resource_size(node, force=False):
             report_exception(e)
 
     return size, False
+
+
+def migrate_extra_fields(extra_fields):
+    if not isinstance(extra_fields, dict):
+        return extra_fields
+    m = extra_fields.pop("m", None)
+    n = extra_fields.pop("n", None)
+    mastery_model = extra_fields.pop("mastery_model", None)
+    if not extra_fields.get("options", {}).get("completion_criteria", {}) and mastery_model is not None:
+        extra_fields["options"] = extra_fields.get("options", {})
+        extra_fields["options"]["completion_criteria"] = {
+            "threshold": {
+                "m": m,
+                "n": n,
+                "mastery_model": mastery_model,
+            },
+            "model": completion_criteria.MASTERY,
+        }
+    return extra_fields
diff --git a/contentcuration/contentcuration/utils/publish.py b/contentcuration/contentcuration/utils/publish.py
index 5b38d85576..6593c14bc8 100644
--- a/contentcuration/contentcuration/utils/publish.py
+++ b/contentcuration/contentcuration/utils/publish.py
@@ -51,6 +51,7 @@
 from contentcuration.utils.cache import delete_public_channel_cache_keys
 from contentcuration.utils.files import create_thumbnail_from_base64
 from contentcuration.utils.files import get_thumbnail_encoding
+from contentcuration.utils.nodes import migrate_extra_fields
 from contentcuration.utils.parser import extract_value
 from contentcuration.utils.parser import load_json_string
 from contentcuration.utils.sentry import report_exception
@@ -161,13 +162,17 @@ def assign_license_to_contentcuration_nodes(channel, license):
     channel.main_tree.get_family().update(license_id=license.pk)
 
 
-inheritable_fields = [
+inheritable_map_fields = [
     "grade_levels",
     "resource_types",
     "categories",
     "learner_needs",
 ]
 
+inheritable_simple_value_fields = [
+    "language",
+]
+
 
 class TreeMapper:
     def __init__(
@@ -201,7 +206,7 @@ def _node_completed(self):
     def map_nodes(self):
         self.recurse_nodes(self.root_node, {})
 
-    def recurse_nodes(self, node, inherited_fields):
+    def recurse_nodes(self, node, inherited_fields):  # noqa C901
         logging.debug("Mapping node with id {id}".format(id=node.pk))
 
         # Only process nodes that are either non-topics or have non-topic descendants
@@ -209,7 +214,7 @@ def recurse_nodes(self, node, inherited_fields):
 
             metadata = {}
 
-            for field in inheritable_fields:
+            for field in inheritable_map_fields:
                 metadata[field] = {}
                 inherited_keys = (inherited_fields.get(field) or {}).keys()
                 own_keys = (getattr(node, field) or {}).keys()
@@ -219,6 +224,12 @@ def recurse_nodes(self, node, inherited_fields):
                     if not any(k != key and k.startswith(key) for k in all_keys):
                         metadata[field][key] = True
 
+            for field in inheritable_simple_value_fields:
+                if field in inherited_fields:
+                    metadata[field] = inherited_fields[field]
+                if getattr(node, field):
+                    metadata[field] = getattr(node, field)
+
             kolibrinode = create_bare_contentnode(node, self.default_language, self.channel_id, self.channel_name, metadata)
 
             if node.kind.kind == content_kinds.EXERCISE:
@@ -275,9 +286,9 @@ def create_bare_contentnode(ccnode, default_language, channel_id, channel_name,
     if ccnode.license is not None:
         kolibri_license = create_kolibri_license_object(ccnode)[0]
 
-    language = None
-    if ccnode.language or default_language:
-        language, _new = get_or_create_language(ccnode.language or default_language)
+    language = (ccnode.language if ccnode.kind_id == content_kinds.TOPIC else metadata.get("language")) or default_language
+    if language:
+        language, _new = get_or_create_language(language)
 
     duration = None
     if ccnode.kind_id in [content_kinds.AUDIO, content_kinds.VIDEO]:
@@ -305,6 +316,12 @@ def create_bare_contentnode(ccnode, default_language, channel_id, channel_name,
         if ccnode.accessibility_labels:
             accessibility_labels = ",".join(ccnode.accessibility_labels.keys())
 
+    # Do not use the inherited metadata if this is a topic, just read from its own metadata instead.
+    grade_levels = ccnode.grade_levels if ccnode.kind_id == content_kinds.TOPIC else metadata["grade_levels"]
+    resource_types = ccnode.resource_types if ccnode.kind_id == content_kinds.TOPIC else metadata["resource_types"]
+    categories = ccnode.categories if ccnode.kind_id == content_kinds.TOPIC else metadata["categories"]
+    learner_needs = ccnode.learner_needs if ccnode.kind_id == content_kinds.TOPIC else metadata["learner_needs"]
+
     kolibrinode, is_new = kolibrimodels.ContentNode.objects.update_or_create(
         pk=ccnode.node_id,
         defaults={
@@ -326,12 +343,12 @@ def create_bare_contentnode(ccnode, default_language, channel_id, channel_name,
             'duration': duration,
             'options': json.dumps(options),
             # Fields for metadata labels
-            "grade_levels": ",".join(metadata["grade_levels"].keys()) if metadata["grade_levels"] else None,
-            "resource_types": ",".join(metadata["resource_types"].keys()) if metadata["resource_types"] else None,
+            "grade_levels": ",".join(grade_levels.keys()) if grade_levels else None,
+            "resource_types": ",".join(resource_types.keys()) if resource_types else None,
             "learning_activities": learning_activities,
             "accessibility_labels": accessibility_labels,
-            "categories": ",".join(metadata["categories"].keys()) if metadata["categories"] else None,
-            "learner_needs": ",".join(metadata["learner_needs"].keys()) if metadata["learner_needs"] else None,
+            "categories": ",".join(categories.keys()) if categories else None,
+            "learner_needs": ",".join(learner_needs.keys()) if learner_needs else None,
         }
     )
 
@@ -462,21 +479,16 @@ def create_perseus_exercise(ccnode, kolibrinode, exercise_data, user_id=None):
 def process_assessment_metadata(ccnode, kolibrinode):
     # Get mastery model information, set to default if none provided
     assessment_items = ccnode.assessment_items.all().order_by('order')
-    exercise_data = ccnode.extra_fields if ccnode.extra_fields else {}
-    if isinstance(exercise_data, basestring):
-        exercise_data = json.loads(exercise_data)
-    randomize = exercise_data.get('randomize') if exercise_data.get('randomize') is not None else True
+    extra_fields = ccnode.extra_fields
+    if isinstance(extra_fields, basestring):
+        extra_fields = json.loads(extra_fields)
+    extra_fields = migrate_extra_fields(extra_fields) or {}
+    randomize = extra_fields.get('randomize') if extra_fields.get('randomize') is not None else True
     assessment_item_ids = [a.assessment_id for a in assessment_items]
 
-    exercise_data_type = ""
-    if exercise_data.get('mastery_model'):
-        exercise_data_type = exercise_data.get('mastery_model')
-    if (
-        exercise_data.get('option') and
-        exercise_data.get('option').get('completion_criteria') and
-        exercise_data.get('option').get('completion_criteria').get('mastery_model')
-    ):
-        exercise_data_type = exercise_data.get('option').get('completion_criteria').get('mastery_model')
+    exercise_data = extra_fields.get('options').get('completion_criteria').get('threshold')
+
+    exercise_data_type = exercise_data.get('mastery_model', "")
 
     mastery_model = {'type': exercise_data_type or exercises.M_OF_N}
     if mastery_model['type'] == exercises.M_OF_N:
diff --git a/contentcuration/contentcuration/utils/sync.py b/contentcuration/contentcuration/utils/sync.py
index cba8220da6..c42be1d99d 100644
--- a/contentcuration/contentcuration/utils/sync.py
+++ b/contentcuration/contentcuration/utils/sync.py
@@ -97,9 +97,11 @@ def sync_node_tags(node, original):
     for tag in original.tags.exclude(
         tag_name__in=node.tags.values_list("tag_name", flat=True)
     ):
-        new_tag, _ = ContentTag.objects.get_or_create(
+        new_tag = ContentTag.objects.filter(
             tag_name=tag.tag_name, channel_id=None,
-        )
+        ).first()
+        if not new_tag:
+            new_tag = ContentTag.objects.create(tag_name=tag.tag_name, channel_id=None)
         node.tags.add(new_tag)
         node.changed = True
 
diff --git a/contentcuration/contentcuration/views/users.py b/contentcuration/contentcuration/views/users.py
index a74941e72a..77a45afecd 100644
--- a/contentcuration/contentcuration/views/users.py
+++ b/contentcuration/contentcuration/views/users.py
@@ -90,8 +90,7 @@ def send_invitation_email(request):
                     'channel_id': channel_id,
                     'invitation_key': invitation.id,
                     'channel': channel.name,
-                    'domain': request.META.get('HTTP_ORIGIN') or "https://{}".format(
-                        request.get_host() or Site.objects.get_current().domain),
+                    'domain': "https://{}".format(Site.objects.get_current().domain),
                     }
         subject = render_to_string('permissions/permissions_email_subject.txt', ctx_dict)
         message = render_to_string('permissions/permissions_email.txt', ctx_dict)
@@ -255,7 +254,10 @@ def activate(self, *args, **kwargs):
             )
             # Send email to welcome new user
             subject = render_to_string("registration/welcome_new_user_email_subject.txt")
-            message = render_to_string("registration/welcome_new_user_email.html", {})
+            message = render_to_string(
+                "registration/welcome_new_user_email.html",
+                {"domain": "https://{}".format(Site.objects.get_current().domain)}
+            )
             user.email_user(
                 subject,
                 message,
@@ -271,12 +273,9 @@ class UserPasswordResetView(PasswordResetView):
     http_method_names = ["post"]
 
     def post(self, request):
-        protocol = "https" if request.is_secure() else "http"
-        site = request.get_host() or Site.objects.get_current().domain
         email_context = {
             "site": get_current_site(request),
-            "domain": request.META.get("HTTP_ORIGIN")
-            or "{}://{}".format(protocol, site),
+            "domain": "https://{}".format(Site.objects.get_current().domain),
         }
         form = self.form_class(json.loads(request.body))
         if form.is_valid():
diff --git a/contentcuration/contentcuration/viewsets/channel.py b/contentcuration/contentcuration/viewsets/channel.py
index 90b9a8f84d..ba63b4cb29 100644
--- a/contentcuration/contentcuration/viewsets/channel.py
+++ b/contentcuration/contentcuration/viewsets/channel.py
@@ -395,6 +395,8 @@ class ChannelViewSet(ValuesViewset):
     serializer_class = ChannelSerializer
     pagination_class = ChannelListPagination
     filterset_class = ChannelFilter
+    ordering_fields = ["modified", "name"]
+    ordering = "-modified"
 
     field_map = channel_field_map
     values = base_channel_values + ("edit", "view", "unpublished_changes")
@@ -407,6 +409,15 @@ def get_queryset(self):
         queryset = super(ChannelViewSet, self).get_queryset()
         user_id = not self.request.user.is_anonymous and self.request.user.id
         user_queryset = User.objects.filter(id=user_id)
+        # Add the last modified node modified value as the channel last modified
+        channel_main_tree_nodes = ContentNode.objects.filter(
+            tree_id=OuterRef("main_tree__tree_id")
+        )
+        queryset = queryset.annotate(
+            modified=Subquery(
+                channel_main_tree_nodes.values("modified").order_by("-modified")[:1]
+            )
+        )
 
         return queryset.annotate(
             edit=Exists(user_queryset.filter(editable_channels=OuterRef("id"))),
@@ -418,12 +429,7 @@ def annotate_queryset(self, queryset):
         channel_main_tree_nodes = ContentNode.objects.filter(
             tree_id=OuterRef("main_tree__tree_id")
         )
-        # Add the last modified node modified value as the channel last modified
-        queryset = queryset.annotate(
-            modified=Subquery(
-                channel_main_tree_nodes.values("modified").order_by("-modified")[:1]
-            )
-        )
+
         # Add the unique count of distinct non-topic node content_ids
         non_topic_content_ids = (
             channel_main_tree_nodes.exclude(kind_id=content_kinds.TOPIC)
@@ -556,6 +562,8 @@ class CatalogViewSet(ReadOnlyValuesViewset):
     serializer_class = ChannelSerializer
     pagination_class = CatalogListPagination
     filterset_class = BaseChannelFilter
+    ordering_fields = []
+    ordering = ("-priority", "name")
 
     permission_classes = [AllowAny]
 
diff --git a/contentcuration/contentcuration/viewsets/contentnode.py b/contentcuration/contentcuration/viewsets/contentnode.py
index cc6ad0727f..7c862e1892 100644
--- a/contentcuration/contentcuration/viewsets/contentnode.py
+++ b/contentcuration/contentcuration/viewsets/contentnode.py
@@ -53,6 +53,7 @@
 from contentcuration.models import UUIDField
 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.viewsets.base import BulkListSerializer
 from contentcuration.viewsets.base import BulkModelSerializer
 from contentcuration.viewsets.base import BulkUpdateMixin
@@ -257,7 +258,7 @@ def to_representation(self, value):
     def to_internal_value(self, data):
         try:
             data = int(data)
-        except(ValueError, TypeError):
+        except (ValueError, TypeError):
             if not isinstance(data, (str, dict)):
                 self.fail("Must be either an integer, string or dictionary")
         return data
@@ -283,25 +284,6 @@ def update(self, instance, validated_data):
         return instance
 
 
-def _migrate_extra_fields(extra_fields):
-    if not isinstance(extra_fields, dict):
-        return extra_fields
-    m = extra_fields.pop("m", None)
-    n = extra_fields.pop("n", None)
-    mastery_model = extra_fields.pop("mastery_model", None)
-    if not extra_fields.get("options", {}).get("completion_criteria", {}) and mastery_model is not None:
-        extra_fields["options"] = extra_fields.get("options", {})
-        extra_fields["options"]["completion_criteria"] = {
-            "threshold": {
-                "m": m,
-                "n": n,
-                "mastery_model": mastery_model,
-            },
-            "model": completion_criteria.MASTERY,
-        }
-    return extra_fields
-
-
 class ExtraFieldsOptionsSerializer(JSONFieldDictSerializer):
     modality = ChoiceField(choices=(("QUIZ", "Quiz"),), allow_null=True, required=False)
     completion_criteria = CompletionCriteriaSerializer(required=False)
@@ -313,7 +295,7 @@ class ExtraFieldsSerializer(JSONFieldDictSerializer):
     suggested_duration_type = ChoiceField(choices=[completion_criteria.TIME, completion_criteria.APPROX_TIME], allow_null=True, required=False)
 
     def update(self, instance, validated_data):
-        instance = _migrate_extra_fields(instance)
+        instance = migrate_extra_fields(instance)
         return super(ExtraFieldsSerializer, self).update(instance, validated_data)
 
 
@@ -472,7 +454,7 @@ def retrieve_thumbail_src(item):
 def consolidate_extra_fields(item):
     extra_fields = item.get("extra_fields")
     if item["kind"] == content_kinds.EXERCISE:
-        extra_fields = _migrate_extra_fields(extra_fields)
+        extra_fields = migrate_extra_fields(extra_fields)
 
     return extra_fields
 
@@ -633,7 +615,7 @@ def delete_from_changes(self, changes):
 
 
 def dict_if_none(obj, field_name=None):
-    return obj[field_name] if obj[field_name] else {}
+    return obj[field_name] if field_name in obj and obj[field_name] else {}
 
 
 # Apply mixin first to override ValuesViewset
diff --git a/contentcuration/contentcuration/viewsets/file.py b/contentcuration/contentcuration/viewsets/file.py
index 78e82d6d8d..860645a146 100644
--- a/contentcuration/contentcuration/viewsets/file.py
+++ b/contentcuration/contentcuration/viewsets/file.py
@@ -148,7 +148,7 @@ def upload_url(self, request):
         if duration is not None:
             if not isinstance(duration, (int, float)):
                 return HttpResponseBadRequest(reason="File duration must be a number")
-            duration = math.ceil(duration)
+            duration = math.floor(duration)
 
         try:
             request.user.check_space(float(size), checksum)
diff --git a/integration_testing/features/wip-studio-edit-modal/edit-completion-field.feature b/integration_testing/features/wip-studio-edit-modal/edit-completion-field.feature
index e480ba6aec..3b7070e32e 100755
--- a/integration_testing/features/wip-studio-edit-modal/edit-completion-field.feature
+++ b/integration_testing/features/wip-studio-edit-modal/edit-completion-field.feature
@@ -1,7 +1,7 @@
 Feature: Edit completion/duration field
 	Across all file types
 
-	Background: 
+	Background:
 		Given I am signed into Studio
 			And I am in an editable channel with all resource types
 		When I right click a <resource>
@@ -11,18 +11,20 @@ Feature: Edit completion/duration field
 
 	Scenario: View options for .MP4 or .MP3
 		Given I am viewing an .MP4 or an .MP3 file
+		When I click the *Completion* dropdown
+		Then I see the options: *Complete duration* and *Reference*
 		When I click the *Duration* dropdown
-		Then I see the options: *Exact time to complete*, *Short activity*, *Long activity* and *Reference*
+		Then I see the options: *Exact time to complete*, *Short activity*, and *Long activity*
 
 	Scenario: View options for .PDF, .EPUB or slides
 		Given I am viewing .PDF, .EPUB or slides
 		When I click the *Completion* dropdown
-		Then I see the options: *All content viewed* and *Complete duration*
+		Then I see the options: *All content viewed*, *Complete duration*, and *Reference*
 
 	Scenario: View options for .ZIP
 		Given I am viewing a .ZIP
 		When I click on the *Completion* dropdown
-		Then I see the options: *Complete duration* and *Determined by this resource*
+		Then I see the options: *Complete duration*, *Determined by this resource*, and *Reference*
 
 	Scenario: View options for Practice resources
 		Given I am viewing an exercise