diff --git a/README.md b/README.md
index 9a325e65b2..4bbb1f9a81 100644
--- a/README.md
+++ b/README.md
@@ -230,6 +230,14 @@ yarn run lint-all:fix
 
 Make sure you've set up pre-commit hooks as described above. This will ensure that linting is automatically run on staged changes before every commit.
 
+### Flower
+
+[Flower](https://flower.readthedocs.io/en/latest/) is a Celery monitoring dashboard. It is available on http://localhost:5555 after you run services:
+
+```bash
+yarn run services
+```
+
 ### Storybook
 
 Storybook is a development environment for UI components. If this is your first encounter with this tool, you can check [this presentation](https://docs.google.com/presentation/d/10JL4C9buygWsTbT62Ym149Yh9zSR9nY_ZqFumBKUY0o/edit?usp=sharing) or [its website](https://storybook.js.org/). You are encouraged to use it any time you need to develop a new UI component. It is especially suitable for smaller to middle size components that represent basic UI building blocks.
diff --git a/contentcuration/contentcuration/frontend/accounts/pages/Main.vue b/contentcuration/contentcuration/frontend/accounts/pages/Main.vue
index 8c1574404c..46fabc4b92 100644
--- a/contentcuration/contentcuration/frontend/accounts/pages/Main.vue
+++ b/contentcuration/contentcuration/frontend/accounts/pages/Main.vue
@@ -167,7 +167,7 @@
   }
 
   .links span:not(:last-child)::after {
-    margin: 0 8px;
+    margin: 0 8px 0 12px;
     font-size: 14pt;
     color: var(--v-grey-base);
     vertical-align: middle;
diff --git a/contentcuration/contentcuration/frontend/administration/constants.js b/contentcuration/contentcuration/frontend/administration/constants.js
index 622e4bb955..c0af1bb794 100644
--- a/contentcuration/contentcuration/frontend/administration/constants.js
+++ b/contentcuration/contentcuration/frontend/administration/constants.js
@@ -1,4 +1,4 @@
-export const RouterNames = {
+export const RouteNames = {
   CHANNELS: 'CHANNELS',
   CHANNEL: 'CHANNEL',
   USERS: 'USERS',
diff --git a/contentcuration/contentcuration/frontend/administration/pages/AdministrationAppError.vue b/contentcuration/contentcuration/frontend/administration/pages/AdministrationAppError.vue
index 237e425896..353ed6c1b2 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/AdministrationAppError.vue
+++ b/contentcuration/contentcuration/frontend/administration/pages/AdministrationAppError.vue
@@ -26,7 +26,7 @@
 
 <script>
 
-  import { RouterNames } from '../constants';
+  import { RouteNames } from '../constants';
   import PermissionsError from 'shared/views/errors/PermissionsError';
   import ChannelNotFoundError from 'shared/views/errors/ChannelNotFoundError';
   import PageNotFoundError from 'shared/views/errors/PageNotFoundError';
@@ -61,10 +61,10 @@
       backFromCurrentPageUrl() {
         const currentPage = this.$route.name;
         let toName;
-        if (currentPage === RouterNames.USER) {
-          toName = RouterNames.USERS;
+        if (currentPage === RouteNames.USER) {
+          toName = RouteNames.USERS;
         } else {
-          toName = RouterNames.CHANNELS;
+          toName = RouteNames.CHANNELS;
         }
         return {
           to: { name: toName },
diff --git a/contentcuration/contentcuration/frontend/administration/pages/AdministrationIndex.vue b/contentcuration/contentcuration/frontend/administration/pages/AdministrationIndex.vue
index e7414cbb9b..0b359fadf5 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/AdministrationIndex.vue
+++ b/contentcuration/contentcuration/frontend/administration/pages/AdministrationIndex.vue
@@ -28,7 +28,7 @@
 
 <script>
 
-  import { RouterNames } from '../constants';
+  import { RouteNames } from '../constants';
   import AdministrationAppError from './AdministrationAppError';
   import AppBar from 'shared/views/AppBar';
   import GlobalSnackbar from 'shared/views/GlobalSnackbar';
@@ -52,12 +52,12 @@
       },
       channelsLink() {
         return {
-          name: RouterNames.CHANNELS,
+          name: RouteNames.CHANNELS,
         };
       },
       usersLink() {
         return {
-          name: RouterNames.USERS,
+          name: RouteNames.USERS,
         };
       },
     },
diff --git a/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelActionsDropdown.vue b/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelActionsDropdown.vue
index cb19d7470b..5c396640c5 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelActionsDropdown.vue
+++ b/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelActionsDropdown.vue
@@ -119,7 +119,7 @@
 
   import { mapActions, mapGetters } from 'vuex';
   import ConfirmationDialog from '../../components/ConfirmationDialog';
-  import { RouterNames } from '../../constants';
+  import { RouteNames } from '../../constants';
   import { channelExportMixin } from 'shared/views/channel/mixins';
 
   export default {
@@ -151,7 +151,7 @@
       },
       searchChannelEditorsLink() {
         return {
-          name: RouterNames.USERS,
+          name: RouteNames.USERS,
           query: {
             search: `${this.name} ${this.channel.id}`,
           },
diff --git a/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelDetails.vue b/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelDetails.vue
index f27840ec71..37aac76eef 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelDetails.vue
+++ b/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelDetails.vue
@@ -54,7 +54,7 @@
 <script>
 
   import { mapActions, mapGetters } from 'vuex';
-  import { RouterNames } from '../../constants';
+  import { RouteNames } from '../../constants';
   import ChannelActionsDropdown from './ChannelActionsDropdown';
   import ChannelSharing from 'shared/views/channel/ChannelSharing';
   import Details from 'shared/views/details/Details';
@@ -109,7 +109,7 @@
       },
       backLink() {
         return {
-          name: RouterNames.CHANNELS,
+          name: RouteNames.CHANNELS,
           query: this.$route.query,
         };
       },
diff --git a/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelItem.vue b/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelItem.vue
index 74f8c794ac..4635770492 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelItem.vue
+++ b/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelItem.vue
@@ -174,7 +174,7 @@
 
   import { mapGetters, mapActions } from 'vuex';
   import ClipboardChip from '../../components/ClipboardChip';
-  import { RouterNames } from '../../constants';
+  import { RouteNames } from '../../constants';
   import ChannelActionsDropdown from './ChannelActionsDropdown';
   import Checkbox from 'shared/views/form/Checkbox';
   import { fileSizeMixin } from 'shared/mixins';
@@ -220,7 +220,7 @@
       },
       channelModalLink() {
         return {
-          name: RouterNames.CHANNEL,
+          name: RouteNames.CHANNEL,
           params: { channelId: this.channelId },
           query: this.$route.query,
         };
@@ -230,7 +230,7 @@
       },
       searchChannelEditorsLink() {
         return {
-          name: RouterNames.USERS,
+          name: RouteNames.USERS,
           query: {
             keywords: `${this.channel.name} ${this.channelId}`,
           },
diff --git a/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelTable.vue b/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelTable.vue
index 44bbfb2d40..76bfc4d4e2 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelTable.vue
+++ b/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelTable.vue
@@ -101,7 +101,7 @@
 
   import { mapGetters, mapActions } from 'vuex';
   import { tableMixin, generateFilterMixin } from '../../mixins';
-  import { RouterNames, rowsPerPageItems } from '../../constants';
+  import { RouteNames, rowsPerPageItems } from '../../constants';
   import ChannelItem from './ChannelItem';
   import { channelExportMixin } from 'shared/views/channel/mixins';
   import { routerMixin } from 'shared/mixins';
@@ -195,7 +195,7 @@
       $route: {
         deep: true,
         handler(newRoute, oldRoute) {
-          if (newRoute.name === oldRoute.name && newRoute.name === RouterNames.CHANNELS)
+          if (newRoute.name === oldRoute.name && newRoute.name === RouteNames.CHANNELS)
             this.selected = [];
         },
       },
diff --git a/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelDetails.spec.js b/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelDetails.spec.js
index 5bcde34172..08e2099eed 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelDetails.spec.js
+++ b/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelDetails.spec.js
@@ -1,7 +1,7 @@
 import { mount } from '@vue/test-utils';
 import router from '../../../router';
 import { factory } from '../../../store';
-import { RouterNames } from '../../../constants';
+import { RouteNames } from '../../../constants';
 import ChannelDetails from './../ChannelDetails';
 
 const store = factory();
@@ -9,7 +9,7 @@ const store = factory();
 const channelId = '11111111111111111111111111111111';
 
 function makeWrapper() {
-  router.replace({ name: RouterNames.CHANNEL, params: { channelId } });
+  router.replace({ name: RouteNames.CHANNEL, params: { channelId } });
   return mount(ChannelDetails, {
     router,
     store,
@@ -37,7 +37,7 @@ describe('channelDetails', () => {
   });
   it('clicking close should close the modal', () => {
     wrapper.vm.dialog = false;
-    expect(wrapper.vm.$route.name).toBe(RouterNames.CHANNELS);
+    expect(wrapper.vm.$route.name).toBe(RouteNames.CHANNELS);
   });
   describe('load', () => {
     it('should automatically close if loadChannel does not find a channel', () => {
@@ -46,7 +46,7 @@ describe('channelDetails', () => {
         loadChannelDetails: jest.fn().mockReturnValue(Promise.resolve()),
       });
       return wrapper.vm.load().then(() => {
-        expect(wrapper.vm.$route.name).toBe(RouterNames.CHANNELS);
+        expect(wrapper.vm.$route.name).toBe(RouteNames.CHANNELS);
       });
     });
     it('load should call loadChannel and loadChannelDetails', () => {
diff --git a/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelItem.spec.js b/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelItem.spec.js
index 4c86cab25f..b384d32f5e 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelItem.spec.js
+++ b/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelItem.spec.js
@@ -1,7 +1,7 @@
 import { mount } from '@vue/test-utils';
 import router from '../../../router';
 import { factory } from '../../../store';
-import { RouterNames } from '../../../constants';
+import { RouteNames } from '../../../constants';
 import ChannelItem from '../ChannelItem';
 
 const store = factory();
@@ -21,7 +21,7 @@ const channel = {
 };
 
 function makeWrapper() {
-  router.replace({ name: RouterNames.CHANNELS });
+  router.replace({ name: RouteNames.CHANNELS });
   return mount(ChannelItem, {
     router,
     store,
diff --git a/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelTable.spec.js b/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelTable.spec.js
index 37c3951574..1ced780018 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelTable.spec.js
+++ b/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelTable.spec.js
@@ -1,7 +1,7 @@
 import { mount } from '@vue/test-utils';
 import router from '../../../router';
 import { factory } from '../../../store';
-import { RouterNames } from '../../../constants';
+import { RouteNames } from '../../../constants';
 import ChannelTable from '../ChannelTable';
 
 const store = factory();
@@ -9,7 +9,7 @@ const store = factory();
 const loadChannels = jest.fn().mockReturnValue(Promise.resolve());
 const channelList = ['test', 'channel', 'table'];
 function makeWrapper() {
-  router.replace({ name: RouterNames.CHANNELS });
+  router.replace({ name: RouteNames.CHANNELS });
   return mount(ChannelTable, {
     router,
     store,
diff --git a/contentcuration/contentcuration/frontend/administration/pages/Users/UserDetails.vue b/contentcuration/contentcuration/frontend/administration/pages/Users/UserDetails.vue
index c289b4ebb0..07a057aba3 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Users/UserDetails.vue
+++ b/contentcuration/contentcuration/frontend/administration/pages/Users/UserDetails.vue
@@ -131,7 +131,7 @@
 
   import capitalize from 'lodash/capitalize';
   import { mapActions, mapGetters } from 'vuex';
-  import { RouterNames } from '../../constants';
+  import { RouteNames } from '../../constants';
   import UserStorage from './UserStorage';
   import UserActionsDropdown from './UserActionsDropdown';
   import { routerMixin, fileSizeMixin } from 'shared/mixins';
@@ -193,7 +193,7 @@
       },
       backLink() {
         return {
-          name: RouterNames.USERS,
+          name: RouteNames.USERS,
           query: this.$route.query,
         };
       },
diff --git a/contentcuration/contentcuration/frontend/administration/pages/Users/UserItem.vue b/contentcuration/contentcuration/frontend/administration/pages/Users/UserItem.vue
index 33c6bc2a02..ff9169866d 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Users/UserItem.vue
+++ b/contentcuration/contentcuration/frontend/administration/pages/Users/UserItem.vue
@@ -96,7 +96,7 @@
 
   import capitalize from 'lodash/capitalize';
   import { mapGetters } from 'vuex';
-  import { RouterNames } from '../../constants';
+  import { RouteNames } from '../../constants';
   import UserActionsDropdown from './UserActionsDropdown';
   import UserStorage from './UserStorage';
   import Checkbox from 'shared/views/form/Checkbox';
@@ -146,14 +146,14 @@
       },
       userModalLink() {
         return {
-          name: RouterNames.USER,
+          name: RouteNames.USER,
           params: { userId: this.userId },
           query: this.$route.query,
         };
       },
       searchUserChannelsLink() {
         return {
-          name: RouterNames.CHANNELS,
+          name: RouteNames.CHANNELS,
           query: {
             keywords: `${this.user.name} ${this.user.email}`,
           },
diff --git a/contentcuration/contentcuration/frontend/administration/pages/Users/UserTable.vue b/contentcuration/contentcuration/frontend/administration/pages/Users/UserTable.vue
index 342f6984df..66953024d3 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Users/UserTable.vue
+++ b/contentcuration/contentcuration/frontend/administration/pages/Users/UserTable.vue
@@ -103,7 +103,7 @@
 <script>
 
   import { mapGetters, mapActions } from 'vuex';
-  import { RouterNames, rowsPerPageItems } from '../../constants';
+  import { RouteNames, rowsPerPageItems } from '../../constants';
   import { tableMixin, generateFilterMixin } from '../../mixins';
   import EmailUsersDialog from './EmailUsersDialog';
   import UserItem from './UserItem';
@@ -195,7 +195,7 @@
       $route: {
         deep: true,
         handler(newRoute, oldRoute) {
-          if (newRoute.name === oldRoute.name && newRoute.name === RouterNames.USERS)
+          if (newRoute.name === oldRoute.name && newRoute.name === RouteNames.USERS)
             this.selected = [];
         },
       },
diff --git a/contentcuration/contentcuration/frontend/administration/pages/Users/__tests__/userDetails.spec.js b/contentcuration/contentcuration/frontend/administration/pages/Users/__tests__/userDetails.spec.js
index f874605371..7d9c946e32 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Users/__tests__/userDetails.spec.js
+++ b/contentcuration/contentcuration/frontend/administration/pages/Users/__tests__/userDetails.spec.js
@@ -1,7 +1,7 @@
 import { mount } from '@vue/test-utils';
 import router from '../../../router';
 import { factory } from '../../../store';
-import { RouterNames } from '../../../constants';
+import { RouteNames } from '../../../constants';
 import UserDetails from '../UserDetails';
 
 const store = factory();
@@ -22,7 +22,7 @@ const details = {
 };
 
 function makeWrapper(userProps = {}) {
-  router.replace({ name: RouterNames.USER, params: { userId } });
+  router.replace({ name: RouteNames.USER, params: { userId } });
   return mount(UserDetails, {
     router,
     store,
@@ -53,7 +53,7 @@ describe('userDetails', () => {
   });
   it('clicking close should close the modal', () => {
     wrapper.vm.dialog = false;
-    expect(wrapper.vm.$route.name).toBe(RouterNames.USERS);
+    expect(wrapper.vm.$route.name).toBe(RouteNames.USERS);
   });
   describe('load', () => {
     it('should automatically close if loadUser does not find a channel', () => {
@@ -62,7 +62,7 @@ describe('userDetails', () => {
         loadUserDetails: jest.fn().mockReturnValue(Promise.resolve()),
       });
       return wrapper.vm.load().then(() => {
-        expect(wrapper.vm.$route.name).toBe(RouterNames.USERS);
+        expect(wrapper.vm.$route.name).toBe(RouteNames.USERS);
       });
     });
     it('load should call loadUser and loadUserDetails', () => {
@@ -79,7 +79,7 @@ describe('userDetails', () => {
     wrapper.setData({ loading: false });
     wrapper.find('[data-test="dropdown"]').vm.$emit('deleted');
     wrapper.vm.$nextTick(() => {
-      expect(wrapper.vm.$route.name).toBe(RouterNames.USERS);
+      expect(wrapper.vm.$route.name).toBe(RouteNames.USERS);
     });
   });
   it('progress bar should reflect storage used', () => {
diff --git a/contentcuration/contentcuration/frontend/administration/pages/Users/__tests__/userItem.spec.js b/contentcuration/contentcuration/frontend/administration/pages/Users/__tests__/userItem.spec.js
index 6d15947c9d..0278929ee3 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Users/__tests__/userItem.spec.js
+++ b/contentcuration/contentcuration/frontend/administration/pages/Users/__tests__/userItem.spec.js
@@ -1,7 +1,7 @@
 import { mount } from '@vue/test-utils';
 import router from '../../../router';
 import { factory } from '../../../store';
-import { RouterNames } from '../../../constants';
+import { RouteNames } from '../../../constants';
 import UserItem from '../UserItem';
 
 const store = factory();
@@ -16,7 +16,7 @@ const user = {
 };
 
 function makeWrapper() {
-  router.replace({ name: RouterNames.USERS });
+  router.replace({ name: RouteNames.USERS });
   return mount(UserItem, {
     router,
     store,
diff --git a/contentcuration/contentcuration/frontend/administration/pages/Users/__tests__/userTable.spec.js b/contentcuration/contentcuration/frontend/administration/pages/Users/__tests__/userTable.spec.js
index e91d47762e..9c82ef886c 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Users/__tests__/userTable.spec.js
+++ b/contentcuration/contentcuration/frontend/administration/pages/Users/__tests__/userTable.spec.js
@@ -1,7 +1,7 @@
 import { mount } from '@vue/test-utils';
 import router from '../../../router';
 import { factory } from '../../../store';
-import { RouterNames } from '../../../constants';
+import { RouteNames } from '../../../constants';
 import UserTable from '../UserTable';
 
 const store = factory();
@@ -9,7 +9,7 @@ const store = factory();
 const loadUsers = jest.fn().mockReturnValue(Promise.resolve());
 const userList = ['test', 'user', 'table'];
 function makeWrapper() {
-  router.replace({ name: RouterNames.USERS });
+  router.replace({ name: RouteNames.USERS });
   return mount(UserTable, {
     router,
     store,
diff --git a/contentcuration/contentcuration/frontend/administration/router.js b/contentcuration/contentcuration/frontend/administration/router.js
index e3a3def76a..207445f11d 100644
--- a/contentcuration/contentcuration/frontend/administration/router.js
+++ b/contentcuration/contentcuration/frontend/administration/router.js
@@ -1,5 +1,5 @@
 import VueRouter from 'vue-router';
-import { RouterNames } from './constants';
+import { RouteNames } from './constants';
 import ChannelTable from './pages/Channels/ChannelTable';
 import ChannelDetails from './pages/Channels/ChannelDetails';
 import UserTable from './pages/Users/UserTable';
@@ -8,23 +8,23 @@ import UserDetails from './pages/Users/UserDetails';
 const router = new VueRouter({
   routes: [
     {
-      name: RouterNames.CHANNELS,
+      name: RouteNames.CHANNELS,
       path: '/channels/',
       component: ChannelTable,
     },
     {
-      name: RouterNames.CHANNEL,
+      name: RouteNames.CHANNEL,
       path: '/channels/:channelId',
       props: true,
       component: ChannelDetails,
     },
     {
-      name: RouterNames.USERS,
+      name: RouteNames.USERS,
       path: '/users/',
       component: UserTable,
     },
     {
-      name: RouterNames.USER,
+      name: RouteNames.USER,
       path: '/users/:userId',
       props: true,
       component: UserDetails,
@@ -32,7 +32,7 @@ const router = new VueRouter({
     // Catch-all redirect to channels tab
     {
       path: '*',
-      redirect: { name: RouterNames.CHANNELS },
+      redirect: { name: RouteNames.CHANNELS },
     },
   ],
 });
diff --git a/contentcuration/contentcuration/frontend/channelEdit/__tests__/utils.spec.js b/contentcuration/contentcuration/frontend/channelEdit/__tests__/utils.spec.js
index 46adda97a8..9c2683d3e3 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/__tests__/utils.spec.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/__tests__/utils.spec.js
@@ -7,7 +7,7 @@ import {
   importedChannelLink,
 } from '../utils';
 import router from '../router';
-import { RouterNames } from '../constants';
+import { RouteNames } from '../constants';
 import { AssessmentItemTypes } from 'shared/constants';
 
 describe('channelEdit utils', () => {
@@ -31,7 +31,7 @@ describe('channelEdit utils', () => {
       expect(isImportedContent(notImportedContent)).toBe(false);
 
       const expectedRoute = router.resolve({
-        name: RouterNames.ORIGINAL_SOURCE_NODE_IN_TREE_VIEW,
+        name: RouteNames.ORIGINAL_SOURCE_NODE_IN_TREE_VIEW,
         params: {
           originalSourceNodeId: 'source-node-id',
         },
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/ContentNodeOptions.vue b/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/ContentNodeOptions.vue
index 06baa04dc7..9274e33a16 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/ContentNodeOptions.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/ContentNodeOptions.vue
@@ -21,7 +21,7 @@
 <script>
 
   import { mapActions, mapGetters } from 'vuex';
-  import { RouterNames } from '../../constants';
+  import { RouteNames } from '../../constants';
   import MoveModal from '../move/MoveModal';
   import clipboardMixin from './mixins';
   import { withChangeTracker } from 'shared/data/changes';
@@ -52,7 +52,7 @@
       viewLink() {
         const channelURI = window.Urls.channel(this.channelId);
         const sourceNode = this.$router.resolve({
-          name: RouterNames.TREE_VIEW,
+          name: RouteNames.TREE_VIEW,
           params: {
             nodeId: this.contentNode.parent,
             detailNodeId: this.contentNode.id,
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeOptions.vue b/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeOptions.vue
index f780328deb..e0cc21cda0 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 { RouterNames } from '../constants';
+  import { RouteNames } from '../constants';
   import MoveModal from './move/MoveModal';
   import { withChangeTracker } from 'shared/data/changes';
   import { RELATIVE_TREE_POSITIONS } from 'shared/data/constants';
@@ -78,7 +78,7 @@
       },
       editLink() {
         return {
-          name: RouterNames.CONTENTNODE_DETAILS,
+          name: RouteNames.CONTENTNODE_DETAILS,
           params: {
             ...this.$route.params,
             detailNodeIds: this.nodeId,
@@ -87,7 +87,7 @@
       },
       viewLink() {
         return {
-          name: RouterNames.TREE_VIEW,
+          name: RouteNames.TREE_VIEW,
           params: {
             ...this.$route.params,
             detailNodeId: this.nodeId,
@@ -114,7 +114,7 @@
         };
         this.createContentNode(nodeData).then(newId => {
           this.$router.push({
-            name: RouterNames.ADD_TOPICS,
+            name: RouteNames.ADD_TOPICS,
             params: {
               ...this.$route.params,
               detailNodeIds: newId,
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/RelatedResourcesTab/RelatedResourcesTab.vue b/contentcuration/contentcuration/frontend/channelEdit/components/RelatedResourcesTab/RelatedResourcesTab.vue
index 545da7406a..f1ca25a055 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/RelatedResourcesTab/RelatedResourcesTab.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/RelatedResourcesTab/RelatedResourcesTab.vue
@@ -26,45 +26,24 @@
       />
     </p>
 
-    <VDialog
-      v-model="showResourcePreview"
-      width="490"
+    <KModal
+      v-if="showResourcePreview"
+      :title="$tr('resourcePreviewDialogTitle')"
+      :cancelText="$tr('dialogCloseBtnLabel')"
+      @cancel="showResourcePreview = false"
     >
-      <VCard>
-        <VCardTitle>
-          <h3 class="font-weight-bold title">
-            {{ $tr('resourcePreviewDialogTitle') }}
-          </h3>
-        </VCardTitle>
-
-        <VCardText>
-          <img src="./related-resources-preview.png" class="resource-preview">
-
-          <VLayout mt-3>
-            <VFlex>
-              <Icon color="primary" class="mx-1">
-                $vuetify.icons.light_bulb
-              </Icon>
-            </VFlex>
-            <VFlex class="mx-2">
-              <p>{{ $tr('resourcePreviewDialogHelpText') }}</p>
-            </VFlex>
-          </VLayout>
-
-          <VLayout justify-end>
-            <VFlex shrink>
-              <VBtn
-                color="greyBackground"
-                class="font-weight-bold"
-                @click="showResourcePreview = false"
-              >
-                {{ $tr('dialogCloseBtnLabel') }}
-              </VBtn>
-            </VFlex>
-          </VLayout>
-        </VCardText>
-      </VCard>
-    </VDialog>
+      <img src="./related-resources-preview.png" class="resource-preview">
+      <VLayout mt-3>
+        <VFlex>
+          <Icon color="primary" class="mx-1">
+            $vuetify.icons.light_bulb
+          </Icon>
+        </VFlex>
+        <VFlex class="mx-2">
+          <p>{{ $tr('resourcePreviewDialogHelpText') }}</p>
+        </VFlex>
+      </VLayout>
+    </KModal>
 
     <VLayout justify-start wrap>
       <VFlex
@@ -144,7 +123,7 @@
 
   import { mapGetters, mapActions } from 'vuex';
 
-  import { RouterNames } from '../../constants';
+  import { RouteNames } from '../../constants';
 
   import RelatedResourcesList from '../RelatedResourcesList/RelatedResourcesList';
   import ContentNodeIcon from 'shared/views/ContentNodeIcon';
@@ -186,7 +165,7 @@
       ...mapActions('contentNode', ['removePreviousStepFromNode', 'removeNextStepFromNode']),
       onStepClick(nodeId) {
         const route = this.$router.resolve({
-          name: RouterNames.CONTENTNODE_DETAILS,
+          name: RouteNames.CONTENTNODE_DETAILS,
           params: {
             detailNodeIds: nodeId,
           },
@@ -205,7 +184,7 @@
       },
       onAddPreviousStepClick() {
         this.$router.push({
-          name: RouterNames.ADD_PREVIOUS_STEPS,
+          name: RouteNames.ADD_PREVIOUS_STEPS,
           params: {
             ...this.$route.params,
             targetNodeId: this.nodeId,
@@ -217,7 +196,7 @@
       },
       onAddNextStepClick() {
         this.$router.push({
-          name: RouterNames.ADD_NEXT_STEPS,
+          name: RouteNames.ADD_NEXT_STEPS,
           params: {
             ...this.$route.params,
             targetNodeId: this.nodeId,
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditListItem.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditListItem.vue
index 6395554100..4273482198 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditListItem.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditListItem.vue
@@ -72,7 +72,7 @@
 <script>
 
   import { mapActions, mapGetters } from 'vuex';
-  import { RouterNames } from '../../constants';
+  import { RouteNames } from '../../constants';
   import { fileSizeMixin, fileStatusMixin } from 'shared/mixins';
   import ContentNodeIcon from 'shared/views/ContentNodeIcon';
   import Checkbox from 'shared/views/form/Checkbox';
@@ -137,9 +137,9 @@
       canRemove() {
         return (
           this.canEdit &&
-          (this.$route.name === RouterNames.ADD_TOPICS ||
-            this.$route.name === RouterNames.UPLOAD_FILES ||
-            this.$route.name === RouterNames.ADD_EXERCISE)
+          (this.$route.name === RouteNames.ADD_TOPICS ||
+            this.$route.name === RouteNames.UPLOAD_FILES ||
+            this.$route.name === RouteNames.ADD_EXERCISE)
         );
       },
       uploadingFiles() {
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue
index 4c820f0058..5247a64aa2 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue
@@ -178,7 +178,7 @@
 <script>
 
   import { mapActions, mapGetters, mapMutations, mapState } from 'vuex';
-  import { RouterNames, TabNames } from '../../constants';
+  import { RouteNames, TabNames } from '../../constants';
   import FileUploadDefault from '../../views/files/FileUploadDefault';
   import EditList from './EditList';
   import EditView from './EditView';
@@ -257,18 +257,18 @@
         return this.nodeIds.length > 1;
       },
       addTopicsMode() {
-        return this.$route.name === RouterNames.ADD_TOPICS;
+        return this.$route.name === RouteNames.ADD_TOPICS;
       },
       uploadMode() {
-        return this.$route.name === RouterNames.UPLOAD_FILES;
+        return this.$route.name === RouteNames.UPLOAD_FILES;
       },
       /* eslint-disable kolibri/vue-no-unused-properties */
       createExerciseMode() {
-        return this.$route.name === RouterNames.ADD_EXERCISE;
+        return this.$route.name === RouteNames.ADD_EXERCISE;
       },
       /* eslint-enable */
       editMode() {
-        return this.$route.name === RouterNames.CONTENTNODE_DETAILS;
+        return this.$route.name === RouteNames.CONTENTNODE_DETAILS;
       },
       showStorage() {
         return this.uploadMode || this.editMode;
@@ -305,10 +305,10 @@
     },
     beforeRouteEnter(to, from, next) {
       if (
-        to.name === RouterNames.CONTENTNODE_DETAILS ||
-        to.name === RouterNames.ADD_TOPICS ||
-        to.name === RouterNames.ADD_EXERCISE ||
-        to.name === RouterNames.UPLOAD_FILES
+        to.name === RouteNames.CONTENTNODE_DETAILS ||
+        to.name === RouteNames.ADD_TOPICS ||
+        to.name === RouteNames.ADD_EXERCISE ||
+        to.name === RouteNames.UPLOAD_FILES
       ) {
         return next(vm => {
           // Catch view-only enters before loading data
@@ -402,7 +402,7 @@
       navigateBack() {
         this.hideHTMLScroll(false);
         this.$router.push({
-          name: RouterNames.TREE_VIEW,
+          name: RouteNames.TREE_VIEW,
           params: { nodeId: this.$route.params.nodeId },
         });
       },
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/move/MoveModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/move/MoveModal.vue
index 3af7637b46..ee30724ef3 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/move/MoveModal.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/move/MoveModal.vue
@@ -137,7 +137,7 @@
 <script>
 
   import { mapGetters, mapActions } from 'vuex';
-  import { RouterNames } from '../../constants';
+  import { RouteNames } from '../../constants';
   import ResourceDrawer from '../ResourceDrawer';
   import NewTopicModal from './NewTopicModal';
   import Breadcrumbs from 'shared/views/Breadcrumbs';
@@ -245,7 +245,7 @@
       },
       goToLocation() {
         this.$router.push({
-          name: RouterNames.TREE_VIEW,
+          name: RouteNames.TREE_VIEW,
           params: {
             nodeId: this.targetNodeId,
           },
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/publish/PublishModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/publish/PublishModal.vue
index 4101e141a7..60d9fd7f8c 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/publish/PublishModal.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/publish/PublishModal.vue
@@ -1,106 +1,76 @@
 <template>
 
-  <VDialog v-model="dialog" maxWidth="500px" lazy>
-    <VCard class="pa-4">
-      <h1 class="headline">
-        {{ currentChannel.name }}
-      </h1>
-      <p v-if="loading" class="pt-1">
-        <VProgressCircular indeterminate size="16" color="grey lighten-1" />
-      </p>
-      <p v-else class="body-2 grey--text metadata pt-1">
-        <span>
-          {{ languageName }}
-        </span>
-        <span>
-          {{ $tr('publishingSizeText', { count: node.resource_count }) }}
-        </span>
-        <span>
-          {{ formatFileSize(size) }}
-        </span>
-        <span v-if="currentChannel.version">
-          {{ $tr('versionText', { version: currentChannel.version }) }}
-        </span>
-        <span v-else>
-          {{ $tr('unpublishedText') }}
+  <div>
+    <!--
+      STEP 1 of 3: Incomplete resources
+      (displayed only when some incomplete resources are found)
+    -->
+    <KModal
+      v-if="step === 0"
+      :title="currentChannel.name"
+      :submitText="$tr('nextButton')"
+      :cancelText="$tr('cancelButton')"
+      data-test="incomplete-modal"
+      @submit="step++"
+      @cancel="close"
+    >
+      <p class="subheading">
+        <Icon color="amber">
+          warning
+        </Icon>
+        <span class="mx-2">
+          {{ $tr('incompleteCount', { count: node.error_count }) }}
         </span>
       </p>
-      <VWindow v-model="step">
-        <VWindowItem :key="0">
-          <p class="subheading">
-            <Icon color="amber">
-              warning
-            </Icon>
-            <span class="mx-2">
-              {{ $tr('incompleteCount', { count: node.error_count }) }}
-            </span>
-          </p>
-          <p class="subheading">
-            {{ $tr('incompleteWarning') }}
-          </p>
-          <p class="subheading">
-            {{ $tr('incompleteInstructions') }}
-          </p>
-          <VCardActions class="pa-0 pt-4">
-            <VSpacer />
-            <VBtn flat data-test="cancel" @click="close">
-              {{ $tr('cancelButton') }}
-            </VBtn>
-            <VBtn
-              color="primary"
-              data-test="next"
-              :disabled="loading"
-              @click="step++"
-            >
-              {{ $tr('nextButton') }}
-            </VBtn>
-          </VCardActions>
-        </VWindowItem>
-        <VWindowItem :key="1">
-          <VForm ref="form" lazy-validation>
-            <VCardText class="px-0">
-              <p class="subheading">
-                {{ $tr('publishMessageLabel') }}
-              </p>
-              <VTextarea
-                v-model="publishDescription"
-                :label="$tr('versionDescriptionLabel')"
-                required
-                :rules="descriptionRules"
-                autoGrow
-                box
-              >
-                <template #append-outer>
-                  <HelpTooltip :text="$tr('descriptionDescriptionTooltip')" bottom />
-                </template>
-              </VTextarea>
-            </VCardText>
-            <VCardActions class="pa-0 pt-4">
-              <VSpacer />
-              <VBtn flat data-test="back" @click="close">
-                {{ $tr('cancelButton') }}
-              </VBtn>
-              <VBtn
-                color="primary"
-                data-test="publish"
-                @click="handlePublish"
-              >
-                {{ $tr('publishButton') }}
-              </VBtn>
-            </VCardActions>
-          </VForm>
-        </VWindowItem>
-      </VWindow>
-    </VCard>
-  </VDialog>
+      <p class="subheading">
+        {{ $tr('incompleteWarning') }}
+      </p>
+      <p class="subheading">
+        {{ $tr('incompleteInstructions') }}
+      </p>
+    </KModal>
+
+    <!-- STEP 2 of 3: Set version and confirm publish -->
+    <KModal
+      v-if="step === 1"
+      :title="currentChannel.name"
+      :submitText="$tr('publishButton')"
+      :cancelText="$tr('cancelButton')"
+      data-test="confirm-publish-modal"
+      @submit="handlePublish"
+      @cancel="close"
+    >
+      <p class="subheading">
+        {{ $tr('publishMessageLabel') }}
+      </p>
+
+      <KFixedGrid :numCols="12">
+        <KGridItem :layout="{ span: 11 }">
+          <KTextbox
+            v-model="publishDescription"
+            :label="$tr('versionDescriptionLabel')"
+            :invalid="!isDescriptionValid"
+            :invalidText="$tr('descriptionRequiredMessage')"
+            :showInvalidText="showInvalidText"
+            autofocus
+            textArea
+          />
+        </KGridItem>
+        <KGridItem :layout="{ span: 1 }">
+          <HelpTooltip :text="$tr('descriptionDescriptionTooltip')" bottom />
+        </KGridItem>
+      </KFixedGrid>
+    </KModal>
+
+    <!-- STEP 3 of 3: Publishing progress dialog -->
+    <!-- Handled by the asyncTasksModule, see channelEdit/vuex/task/index.js -->
+  </div>
 
 </template>
 
 <script>
 
   import { mapActions, mapGetters } from 'vuex';
-  import Languages from 'shared/leUtils/Languages';
-  import { fileSizeMixin } from 'shared/mixins';
   import HelpTooltip from 'shared/views/HelpTooltip';
   import { forceServerSync } from 'shared/data/serverSync';
 
@@ -109,7 +79,6 @@
     components: {
       HelpTooltip,
     },
-    mixins: [fileSizeMixin],
     props: {
       value: {
         type: Boolean,
@@ -121,6 +90,7 @@
         step: 0,
         publishDescription: '',
         size: 0,
+        showInvalidText: false, // lazy validation
         loading: false,
         loadingTaskId: null,
       };
@@ -141,11 +111,8 @@
       node() {
         return this.getContentNode(this.rootId);
       },
-      languageName() {
-        return Languages.get(this.currentChannel.language).native_name;
-      },
-      descriptionRules() {
-        return [v => !!v.trim() || this.$tr('descriptionRequiredMessage')];
+      isDescriptionValid() {
+        return this.publishDescription && this.publishDescription.trim();
       },
       sizeCalculationTask() {
         return this.loadingTaskId ? this.getAsyncTask(this.loadingTaskId) : null;
@@ -167,20 +134,26 @@
     },
     mounted() {
       this.loading = true;
-      this.loadChannelSize(this.rootId).then(response => {
-        this.size = response.size;
-        this.loading = response.stale;
-        this.loadingTaskId = response.changes.length ? response.changes[0].key : null;
-      });
+      // TODO: re-enable when re-added to design
+      // // needs ...mapActions('currentChannel', ['loadChannelSize']),
+      // this.loadChannelSize(this.rootId).then(response => {
+      //   this.size = response.size;
+      //   this.loading = response.stale;
+      //   this.loadingTaskId = response.changes.length ? response.changes[0].key : null;
+      // });
     },
     methods: {
-      ...mapActions('currentChannel', ['loadChannelSize', 'publishChannel']),
+      ...mapActions('currentChannel', ['publishChannel']),
       close() {
         this.publishDescription = '';
         this.dialog = false;
       },
+      validate() {
+        this.showInvalidText = true;
+        return this.isDescriptionValid;
+      },
       async handlePublish() {
-        if (this.$refs.form.validate()) {
+        if (this.validate()) {
           if (!this.areAllChangesSaved) {
             await forceServerSync();
           }
@@ -190,11 +163,6 @@
       },
     },
     $trs: {
-      // Headers
-      versionText: 'Current Version: {version}',
-      unpublishedText: 'Unpublished',
-      publishingSizeText: '{count, plural, =1 {# resource} other {# resources}}',
-
       // Incomplete channel window
       incompleteCount: '{count, plural, =1 {# incomplete resource} other {# incomplete resources}}',
       incompleteWarning:
@@ -214,12 +182,3 @@
   };
 
 </script>
-
-
-<style lang="less" scoped>
-
-  .metadata span:not(:first-child)::before {
-    content: ' • ';
-  }
-
-</style>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/publish/__tests__/publishModal.spec.js b/contentcuration/contentcuration/frontend/channelEdit/components/publish/__tests__/publishModal.spec.js
index d2525228c5..3a8def4786 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/publish/__tests__/publishModal.spec.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/publish/__tests__/publishModal.spec.js
@@ -70,11 +70,17 @@ describe('publishModal', () => {
       wrapper.setData({ step: steps.VALIDATION, loading: false });
     });
     it('next button should go to the next step if enabled', () => {
-      wrapper.find('[data-test="next"]').trigger('click');
+      wrapper
+        .find('[data-test="incomplete-modal"]')
+        .find('form')
+        .trigger('submit');
       expect(wrapper.vm.step).toBe(steps.PUBLISH);
     });
     it('cancel button should close modal', () => {
-      wrapper.find('[data-test="cancel"]').trigger('click');
+      wrapper
+        .find('[data-test="incomplete-modal"]')
+        .find('button[name="cancel"]')
+        .trigger('click');
       expect(wrapper.emitted('input')[0][0]).toBe(false);
     });
   });
@@ -93,22 +99,38 @@ describe('publishModal', () => {
       publishChannel.mockReset();
     });
     it('publish button should trigger form validation', () => {
-      wrapper.vm.$refs.form.validate = jest.fn();
-      wrapper.find('[data-test="publish"]').trigger('click');
-      expect(wrapper.vm.$refs.form.validate).toHaveBeenCalled();
+      expect(wrapper.text()).not.toContain(
+        "Please describe what's new in this version before publishing"
+      );
+      wrapper
+        .find('[data-test="confirm-publish-modal"]')
+        .find('form')
+        .trigger('submit');
+      expect(wrapper.text()).toContain(
+        "Please describe what's new in this version before publishing"
+      );
     });
     it('publishing should be blocked if no description is given', () => {
-      wrapper.find('[data-test="publish"]').trigger('click');
+      wrapper
+        .find('[data-test="confirm-publish-modal"]')
+        .find('form')
+        .trigger('submit');
       expect(publishChannel).not.toHaveBeenCalled();
     });
     it('publish button should call publishChannel if description is given', () => {
       let description = 'Version notes';
       wrapper.setData({ publishDescription: description });
-      wrapper.find('[data-test="publish"]').trigger('click');
+      wrapper
+        .find('[data-test="confirm-publish-modal"]')
+        .find('form')
+        .trigger('submit');
       expect(publishChannel).toHaveBeenCalled();
     });
     it('cancel button on publish step should also close modal', () => {
-      wrapper.find('[data-test="back"]').trigger('click');
+      wrapper
+        .find('[data-test="confirm-publish-modal"]')
+        .find('button[name="cancel"]')
+        .trigger('click');
       expect(wrapper.emitted('input')[0][0]).toBe(false);
     });
   });
diff --git a/contentcuration/contentcuration/frontend/channelEdit/constants.js b/contentcuration/contentcuration/frontend/channelEdit/constants.js
index c94d3adf4e..f36ebc5630 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/constants.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/constants.js
@@ -1,6 +1,6 @@
 import { AssessmentItemTypes } from 'shared/constants';
 
-export const RouterNames = {
+export const RouteNames = {
   SANDBOX: 'SANDBOX',
   TREE_ROOT_VIEW: 'TREE_ROOT_VIEW',
   TREE_VIEW: 'TREE_VIEW',
diff --git a/contentcuration/contentcuration/frontend/channelEdit/pages/AddNextStepsPage.vue b/contentcuration/contentcuration/frontend/channelEdit/pages/AddNextStepsPage.vue
index 7c30a41377..c00ad6a9f8 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/pages/AddNextStepsPage.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/pages/AddNextStepsPage.vue
@@ -12,7 +12,7 @@
 <script>
 
   import { mapActions } from 'vuex';
-  import { RouterNames, TabNames } from '../constants';
+  import { RouteNames, TabNames } from '../constants';
   import AddRelatedResourcesModal from '../components/AddRelatedResourcesModal';
   import { routerMixin, titleMixin } from 'shared/mixins';
 
@@ -43,7 +43,7 @@
         });
       },
       onCancelClick() {
-        let routeName = RouterNames.CONTENTNODE_DETAILS;
+        let routeName = RouteNames.CONTENTNODE_DETAILS;
         if (this.$route.query && this.$route.query.last) {
           routeName = this.$route.query.last;
         }
diff --git a/contentcuration/contentcuration/frontend/channelEdit/pages/AddPreviousStepsPage.vue b/contentcuration/contentcuration/frontend/channelEdit/pages/AddPreviousStepsPage.vue
index a766f455ec..823cccae3f 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/pages/AddPreviousStepsPage.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/pages/AddPreviousStepsPage.vue
@@ -12,7 +12,7 @@
 <script>
 
   import { mapActions } from 'vuex';
-  import { RouterNames, TabNames } from '../constants';
+  import { RouteNames, TabNames } from '../constants';
   import AddRelatedResourcesModal from '../components/AddRelatedResourcesModal';
   import { routerMixin, titleMixin } from 'shared/mixins';
 
@@ -43,7 +43,7 @@
         });
       },
       onCancelClick() {
-        let routeName = RouterNames.CONTENTNODE_DETAILS;
+        let routeName = RouteNames.CONTENTNODE_DETAILS;
         if (this.$route.query && this.$route.query.last) {
           routeName = this.$route.query.last;
         }
diff --git a/contentcuration/contentcuration/frontend/channelEdit/pages/StagingTreePage/index.spec.js b/contentcuration/contentcuration/frontend/channelEdit/pages/StagingTreePage/index.spec.js
index c90d11b428..39651072ff 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/pages/StagingTreePage/index.spec.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/pages/StagingTreePage/index.spec.js
@@ -4,7 +4,7 @@ import VueRouter from 'vue-router';
 import cloneDeep from 'lodash/cloneDeep';
 import flushPromises from 'flush-promises';
 
-import { RouterNames } from '../../constants';
+import { RouteNames } from '../../constants';
 import StagingTreePage from './index';
 import { createStore } from 'shared/vuex/draggablePlugin/test/setup';
 import { ContentKindsNames } from 'shared/leUtils/ContentKinds';
@@ -69,11 +69,11 @@ const initWrapper = ({ getters = GETTERS, actions = ACTIONS, mutations = MUTATIO
     routes: [
       { path: '/' },
       {
-        name: RouterNames.STAGING_TREE_VIEW,
+        name: RouteNames.STAGING_TREE_VIEW,
         path: '/staging/:nodeId/:detailNodeId?',
       },
       {
-        name: RouterNames.TREE_VIEW,
+        name: RouteNames.TREE_VIEW,
         path: '/:nodeId/:detailNodeId?',
       },
     ],
@@ -166,10 +166,6 @@ const getDeployDialogStagedResources = wrapper => {
   return wrapper.find('[data-test="deploy-dialog-staged-resources"]');
 };
 
-const getDeployBtn = wrapper => {
-  return wrapper.find('[data-test="deploy-btn"]');
-};
-
 describe('StagingTreePage', () => {
   it('renders back to viewing link leading to a root tree page in the toolbar', () => {
     const wrapper = initWrapper();
@@ -264,7 +260,7 @@ describe('StagingTreePage', () => {
         nonTopicResource.trigger('click');
 
         const currentRoute = wrapper.vm.$router.currentRoute;
-        expect(currentRoute.name).toBe(RouterNames.STAGING_TREE_VIEW);
+        expect(currentRoute.name).toBe(RouteNames.STAGING_TREE_VIEW);
         expect(currentRoute.params).toEqual({
           nodeId: NODE_ID,
           detailNodeId: 'id-document',
@@ -277,7 +273,7 @@ describe('StagingTreePage', () => {
         nonTopicResource.trigger('dblclick');
 
         const currentRoute = wrapper.vm.$router.currentRoute;
-        expect(currentRoute.name).toBe(RouterNames.STAGING_TREE_VIEW);
+        expect(currentRoute.name).toBe(RouteNames.STAGING_TREE_VIEW);
         expect(currentRoute.params).toEqual({
           nodeId: NODE_ID,
           detailNodeId: 'id-document',
@@ -290,7 +286,7 @@ describe('StagingTreePage', () => {
         nonTopicResource.trigger('click');
 
         const currentRoute = wrapper.vm.$router.currentRoute;
-        expect(currentRoute.name).toBe(RouterNames.STAGING_TREE_VIEW);
+        expect(currentRoute.name).toBe(RouteNames.STAGING_TREE_VIEW);
         expect(currentRoute.params).toEqual({
           nodeId: NODE_ID,
           detailNodeId: 'id-document',
@@ -315,7 +311,7 @@ describe('StagingTreePage', () => {
         getChevronRightBtn(topic).trigger('click');
 
         const currentRoute = wrapper.vm.$router.currentRoute;
-        expect(currentRoute.name).toBe(RouterNames.STAGING_TREE_VIEW);
+        expect(currentRoute.name).toBe(RouteNames.STAGING_TREE_VIEW);
         expect(currentRoute.params).toEqual({
           nodeId: 'id-topic',
           detailNodeId: null,
@@ -328,7 +324,7 @@ describe('StagingTreePage', () => {
         topic.trigger('click');
 
         const currentRoute = wrapper.vm.$router.currentRoute;
-        expect(currentRoute.name).toBe(RouterNames.STAGING_TREE_VIEW);
+        expect(currentRoute.name).toBe(RouteNames.STAGING_TREE_VIEW);
         expect(currentRoute.params).toEqual({
           nodeId: 'id-topic',
           detailNodeId: null,
@@ -341,7 +337,7 @@ describe('StagingTreePage', () => {
         topic.trigger('dblclick');
 
         const currentRoute = wrapper.vm.$router.currentRoute;
-        expect(currentRoute.name).toBe(RouterNames.STAGING_TREE_VIEW);
+        expect(currentRoute.name).toBe(RouteNames.STAGING_TREE_VIEW);
         expect(currentRoute.params).toEqual({
           nodeId: 'id-topic',
           detailNodeId: null,
@@ -354,7 +350,7 @@ describe('StagingTreePage', () => {
         getInfoBtn(topic).trigger('click');
 
         const currentRoute = wrapper.vm.$router.currentRoute;
-        expect(currentRoute.name).toBe(RouterNames.STAGING_TREE_VIEW);
+        expect(currentRoute.name).toBe(RouteNames.STAGING_TREE_VIEW);
         expect(currentRoute.params).toEqual({
           nodeId: NODE_ID,
           detailNodeId: 'id-topic',
@@ -382,21 +378,17 @@ describe('StagingTreePage', () => {
       expect(removeMultipleSpaces(text)).toBe('Total size: 8 MB (+ 8 MB)');
     });
 
-    it('summary details dialog is not visible by default', () => {
-      expect(getSummaryDetailsDialog(wrapper).isVisible()).toBe(false);
-    });
-
     it('opens summary details dialog when view summary button is clicked', () => {
+      expect(getSummaryDetailsDialog(wrapper).exists()).toBe(false);
       getDisplaySummaryDetailsDialogBtn(wrapper).trigger('click');
-      expect(getSummaryDetailsDialog(wrapper).isVisible()).toBe(true);
-    });
 
-    it('deploy dialog is not visible by default', () => {
-      expect(getDeployDialog(wrapper).isVisible()).toBe(false);
+      expect(getSummaryDetailsDialog(wrapper).isVisible()).toBe(true);
     });
 
     it('opens deploy dialog when deploy button is clicked', () => {
+      expect(getDeployDialog(wrapper).exists()).toBe(false);
       getDisplayDeployDialogBtn(wrapper).trigger('click');
+
       expect(getDeployDialog(wrapper).isVisible()).toBe(true);
     });
 
@@ -416,15 +408,16 @@ describe('StagingTreePage', () => {
       });
 
       it('dispatches deploy channel action on deploy channel button click', () => {
-        getDeployBtn(wrapper).trigger('click');
+        getDeployDialog(wrapper).vm.$emit('submit');
+
         expect(mockDeployCurrentChannel).toHaveBeenCalledTimes(1);
       });
 
       it('redirects to a root tree page after deploy channel button click', async () => {
-        getDeployBtn(wrapper).trigger('click');
+        getDeployDialog(wrapper).vm.$emit('submit');
         await flushPromises();
 
-        expect(wrapper.vm.$router.currentRoute.name).toBe(RouterNames.TREE_VIEW);
+        expect(wrapper.vm.$router.currentRoute.name).toBe(RouteNames.TREE_VIEW);
         expect(wrapper.vm.$router.currentRoute.params).toEqual({
           nodeId: ROOT_ID,
         });
diff --git a/contentcuration/contentcuration/frontend/channelEdit/pages/StagingTreePage/index.vue b/contentcuration/contentcuration/frontend/channelEdit/pages/StagingTreePage/index.vue
index 217f651e0a..95c2018ada 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/pages/StagingTreePage/index.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/pages/StagingTreePage/index.vue
@@ -170,101 +170,66 @@
           </VFlex>
 
           <VFlex class="bottom-bar-btns">
-            <VDialog
-              v-model="displaySummaryDetailsDialog"
-              width="500"
+            <VBtn
+              flat
+              data-test="display-summary-details-dialog-btn"
+              @click="displaySummaryDetailsDialog = true"
             >
-              <template v-slot:activator="{ on }">
-                <VBtn
-                  flat
-                  data-test="display-summary-details-dialog-btn"
-                  v-on="on"
-                >
-                  {{ $tr('openSummaryDetailsDialogBtn') }}
-                </VBtn>
-              </template>
-
-              <VCard data-test="summary-details-dialog">
-                <VCardTitle primary-title class="font-weight-bold title">
-                  {{ $tr('summaryDetailsDialogTitle') }}
-                </VCardTitle>
-                <VCardText>
-                  <DiffTable :stagingDiff="stagingDiff" @reload="reloadCurrentChannelStagingDiff" />
-                </VCardText>
-                <VCardActions>
-                  <VSpacer />
-                  <VBtn
-                    color="primary"
-                    @click="displaySummaryDetailsDialog = false"
-                  >
-                    {{ $tr('closeSummaryDetailsDialogBtn') }}
-                  </VBtn>
-                </VCardActions>
-              </VCard>
-            </VDialog>
+              {{ $tr('openSummaryDetailsDialogBtn') }}
+            </VBtn>
 
-            <VDialog
-              v-model="displayDeployDialog"
-              width="500"
+            <VBtn
+              color="primary"
+              data-test="display-deploy-dialog-btn"
+              @click="displayDeployDialog = true"
             >
-              <template v-slot:activator="{ on }">
-                <VBtn
-                  color="primary"
-                  data-test="display-deploy-dialog-btn"
-                  v-on="on"
-                >
-                  {{ $tr('deployChannel') }}
-                </VBtn>
-              </template>
+              {{ $tr('deployChannel') }}
+            </VBtn>
+          </VFLex>
+        </VLayout>
+      </BottomBar>
+
+      <KModal
+        v-if="displaySummaryDetailsDialog"
+        data-test="summary-details-dialog"
+        :title="$tr('summaryDetailsDialogTitle')"
+        :cancelText="$tr('closeSummaryDetailsDialogBtn')"
+        @cancel="displaySummaryDetailsDialog = false"
+      >
+        <DiffTable :stagingDiff="stagingDiff" @reload="reloadCurrentChannelStagingDiff" />
+      </KModal>
 
-              <VCard data-test="deploy-dialog">
-                <VCardTitle primary-title class="font-weight-bold title">
-                  {{ $tr('deployChannel') }}
-                </VCardTitle>
-                <VCardText>
-                  <p>{{ $tr('deployDialogDescription') }}</p>
+      <KModal
+        v-if="displayDeployDialog"
+        data-test="deploy-dialog"
+        :title="$tr('deployChannel')"
+        :submitText="$tr('confirmDeployBtn')"
+        :cancelText="$tr('cancelDeployBtn')"
+        @submit="onDeployChannelClick"
+        @cancel="displayDeployDialog = false"
+      >
+        <p>{{ $tr('deployDialogDescription') }}</p>
 
-                  <VLayout data-test="deploy-dialog-live-resources">
-                    <VFlex xs4 class="font-weight-bold">
-                      {{ $tr('liveResources') }}:
-                    </VFlex>
-                    <VFlex>
-                      {{ $tr('topicsCount', { count: topicsCountLive }) }},
-                      {{ $tr('resourcesCount', { count: resourcesCountLive }) }}
-                    </VFlex>
-                  </VLayout>
+        <VLayout data-test="deploy-dialog-live-resources">
+          <VFlex xs4 class="font-weight-bold">
+            {{ $tr('liveResources') }}:
+          </VFlex>
+          <VFlex>
+            {{ $tr('topicsCount', { count: topicsCountLive }) }},
+            {{ $tr('resourcesCount', { count: resourcesCountLive }) }}
+          </VFlex>
+        </VLayout>
 
-                  <VLayout data-test="deploy-dialog-staged-resources">
-                    <VFlex xs4 class="font-weight-bold">
-                      {{ $tr('stagedResources') }}:
-                    </VFlex>
-                    <VFlex>
-                      {{ $tr('topicsCount', { count: topicsCountStaged }) }},
-                      {{ $tr('resourcesCount', { count: resourcesCountStaged }) }}
-                    </VFlex>
-                  </VLayout>
-                </VCardText>
-                <VCardActions>
-                  <VSpacer />
-                  <VBtn
-                    flat
-                    @click="displayDeployDialog = false"
-                  >
-                    {{ $tr('cancelDeployBtn') }}
-                  </VBtn>
-                  <VBtn
-                    color="primary"
-                    data-test="deploy-btn"
-                    @click="onDeployChannelClick"
-                  >
-                    {{ $tr('confirmDeployBtn') }}
-                  </VBtn>
-                </VCardActions>
-              </VCard>
-            </VDialog>
-          </VFLex>
+        <VLayout data-test="deploy-dialog-staged-resources">
+          <VFlex xs4 class="font-weight-bold">
+            {{ $tr('stagedResources') }}:
+          </VFlex>
+          <VFlex>
+            {{ $tr('topicsCount', { count: topicsCountStaged }) }},
+            {{ $tr('resourcesCount', { count: resourcesCountStaged }) }}
+          </VFlex>
         </VLayout>
-      </BottomBar>
+      </KModal>
     </template>
   </div>
 
@@ -275,7 +240,7 @@
 
   import { mapGetters, mapMutations, mapActions } from 'vuex';
 
-  import { RouterNames, viewModes } from '../../constants';
+  import { RouteNames, viewModes } from '../../constants';
 
   import ContentNodeListItem from '../../components/ContentNodeListItem';
   import StudioTree from '../../components/StudioTree/StudioTree';
@@ -345,7 +310,7 @@
       },
       rootTreeRoute() {
         return {
-          name: RouterNames.TREE_VIEW,
+          name: RouteNames.TREE_VIEW,
           params: {
             nodeId: this.rootId,
           },
@@ -367,7 +332,7 @@
             id: ancestor.id,
             title: ancestor.parent ? ancestor.title : this.currentChannel.name,
             to: {
-              name: RouterNames.STAGING_TREE_VIEW,
+              name: RouteNames.STAGING_TREE_VIEW,
               params: {
                 nodeId: ancestor.id,
               },
@@ -436,7 +401,7 @@
       },
       stagingId() {
         this.$router.push({
-          name: RouterNames.STAGING_TREE_VIEW_REDIRECT,
+          name: RouteNames.STAGING_TREE_VIEW_REDIRECT,
         });
       },
     },
@@ -499,7 +464,7 @@
         }
 
         this.$router.push({
-          name: RouterNames.STAGING_TREE_VIEW,
+          name: RouteNames.STAGING_TREE_VIEW,
           params: {
             nodeId: this.nodeId,
             detailNodeId: nodeId,
@@ -512,7 +477,7 @@
         }
 
         this.$router.push({
-          name: RouterNames.STAGING_TREE_VIEW,
+          name: RouteNames.STAGING_TREE_VIEW,
           params: {
             nodeId: topicId,
             detailNodeId: null,
@@ -528,7 +493,7 @@
       },
       closePanel() {
         this.$router.push({
-          name: RouterNames.STAGING_TREE_VIEW,
+          name: RouteNames.STAGING_TREE_VIEW,
           params: {
             nodeId: this.nodeId,
             detailNodeId: null,
diff --git a/contentcuration/contentcuration/frontend/channelEdit/router.js b/contentcuration/contentcuration/frontend/channelEdit/router.js
index 471d0d24d7..3205ec5b59 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/router.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/router.js
@@ -1,5 +1,5 @@
 import VueRouter from 'vue-router';
-import { RouterNames } from './constants';
+import { RouteNames } from './constants';
 import TreeView from './views/TreeView';
 import StagingTreePage from './pages/StagingTreePage';
 import store from './store';
@@ -9,7 +9,7 @@ import TrashModal from './views/trash/TrashModal';
 import SearchOrBrowseWindow from './views/ImportFromChannels/SearchOrBrowseWindow';
 import ReviewSelectionsPage from './views/ImportFromChannels/ReviewSelectionsPage';
 import EditModal from './components/edit/EditModal';
-import { RouterNames as ChannelRouterNames } from 'frontend/channelList/constants';
+import { RouteNames as ChannelRouteNames } from 'frontend/channelList/constants';
 import Sandbox from 'shared/views/Sandbox';
 import ChannelModal from 'shared/views/channel/ChannelModal';
 import ChannelDetailsModal from 'shared/views/channel/ChannelDetailsModal';
@@ -17,7 +17,7 @@ import ChannelDetailsModal from 'shared/views/channel/ChannelDetailsModal';
 const router = new VueRouter({
   routes: [
     {
-      name: RouterNames.SANDBOX,
+      name: RouteNames.SANDBOX,
       path: '/sandbox/:nodeId',
       props: true,
       component: Sandbox,
@@ -31,13 +31,13 @@ const router = new VueRouter({
       },
     },
     {
-      name: RouterNames.TREE_ROOT_VIEW,
+      name: RouteNames.TREE_ROOT_VIEW,
       path: '/',
       beforeEnter: (to, from, next) => {
         return store.dispatch('currentChannel/loadChannel').then(channel => {
           const nodeId = channel.root_id;
           return next({
-            name: RouterNames.TREE_VIEW,
+            name: RouteNames.TREE_VIEW,
             params: {
               nodeId,
             },
@@ -47,31 +47,31 @@ const router = new VueRouter({
       },
     },
     {
-      name: RouterNames.IMPORT_FROM_CHANNELS_BROWSE,
+      name: RouteNames.IMPORT_FROM_CHANNELS_BROWSE,
       path: '/import/:destNodeId/browse/:channelId?/:nodeId?',
       component: SearchOrBrowseWindow,
       props: true,
     },
     {
-      name: RouterNames.IMPORT_FROM_CHANNELS_SEARCH,
+      name: RouteNames.IMPORT_FROM_CHANNELS_SEARCH,
       path: '/import/:destNodeId/search/:searchTerm',
       component: SearchOrBrowseWindow,
       props: true,
     },
     {
-      name: RouterNames.IMPORT_FROM_CHANNELS_REVIEW,
+      name: RouteNames.IMPORT_FROM_CHANNELS_REVIEW,
       path: '/import/:destNodeId/review',
       component: ReviewSelectionsPage,
       props: true,
     },
     // Redirect to staging URL with root node ID
     {
-      name: RouterNames.STAGING_TREE_VIEW_REDIRECT,
+      name: RouteNames.STAGING_TREE_VIEW_REDIRECT,
       path: '/staging',
       beforeEnter: (to, from, next) => {
         return store.dispatch('currentChannel/loadChannel').then(channel => {
           return next({
-            name: RouterNames.STAGING_TREE_VIEW,
+            name: RouteNames.STAGING_TREE_VIEW,
             params: {
               nodeId: channel.staging_root_id || '',
             },
@@ -81,13 +81,13 @@ const router = new VueRouter({
       },
     },
     {
-      name: RouterNames.STAGING_TREE_VIEW,
+      name: RouteNames.STAGING_TREE_VIEW,
       path: '/staging/:nodeId/:detailNodeId?',
       props: true,
       component: StagingTreePage,
     },
     {
-      name: RouterNames.ADD_PREVIOUS_STEPS,
+      name: RouteNames.ADD_PREVIOUS_STEPS,
       path: '/:nodeId/:detailNodeId?/details/:detailNodeIds/previous-steps/:targetNodeId',
       props: true,
       component: AddPreviousStepsPage,
@@ -106,7 +106,7 @@ const router = new VueRouter({
       },
     },
     {
-      name: RouterNames.ADD_NEXT_STEPS,
+      name: RouteNames.ADD_NEXT_STEPS,
       path: '/:nodeId/:detailNodeId?/details/:detailNodeIds/next-steps/:targetNodeId',
       props: true,
       component: AddNextStepsPage,
@@ -125,7 +125,7 @@ const router = new VueRouter({
       },
     },
     {
-      name: RouterNames.TRASH,
+      name: RouteNames.TRASH,
       path: '/:nodeId/:detailNodeId?/trash',
       component: TrashModal,
       props: true,
@@ -139,7 +139,7 @@ const router = new VueRouter({
       },
     },
     {
-      name: ChannelRouterNames.CHANNEL_DETAILS,
+      name: ChannelRouteNames.CHANNEL_DETAILS,
       path: '/:nodeId/:detailNodeId?/channel/:channelId/details',
       component: ChannelDetailsModal,
       props: true,
@@ -153,7 +153,7 @@ const router = new VueRouter({
       },
     },
     {
-      name: ChannelRouterNames.CHANNEL_EDIT,
+      name: ChannelRouteNames.CHANNEL_EDIT,
       path: '/:nodeId/:detailNodeId?/channel/:channelId/:tab',
       component: ChannelModal,
       props: true,
@@ -167,7 +167,7 @@ const router = new VueRouter({
       },
     },
     {
-      name: RouterNames.CONTENTNODE_DETAILS,
+      name: RouteNames.CONTENTNODE_DETAILS,
       path: '/:nodeId/:detailNodeId?/details/:detailNodeIds/:tab?/:targetNodeId?',
       props: true,
       component: EditModal,
@@ -181,7 +181,7 @@ const router = new VueRouter({
       },
     },
     {
-      name: RouterNames.ADD_TOPICS,
+      name: RouteNames.ADD_TOPICS,
       path: '/:nodeId/:detailNodeId?/topics/:detailNodeIds/:tab?',
       props: true,
       component: EditModal,
@@ -195,7 +195,7 @@ const router = new VueRouter({
       },
     },
     {
-      name: RouterNames.ADD_EXERCISE,
+      name: RouteNames.ADD_EXERCISE,
       path: '/:nodeId/:detailNodeId?/exercise/:detailNodeIds/:tab?',
       props: true,
       component: EditModal,
@@ -209,7 +209,7 @@ const router = new VueRouter({
       },
     },
     {
-      name: RouterNames.UPLOAD_FILES,
+      name: RouteNames.UPLOAD_FILES,
       path: '/:nodeId/:detailNodeId?/upload/:detailNodeIds?/:tab?',
       props: true,
       component: EditModal,
@@ -223,14 +223,14 @@ const router = new VueRouter({
       },
     },
     {
-      name: RouterNames.ORIGINAL_SOURCE_NODE_IN_TREE_VIEW,
+      name: RouteNames.ORIGINAL_SOURCE_NODE_IN_TREE_VIEW,
       path: '/originalSourceNode/:originalSourceNodeId',
       beforeEnter: (to, from, next) => {
         return store
           .dispatch('contentNode/loadContentNodeByNodeId', to.params.originalSourceNodeId)
           .then(node => {
             next({
-              name: RouterNames.TREE_VIEW,
+              name: RouteNames.TREE_VIEW,
               params: {
                 nodeId: node.parent,
                 detailNodeId: node.id,
@@ -240,7 +240,7 @@ const router = new VueRouter({
       },
     },
     {
-      name: RouterNames.TREE_VIEW,
+      name: RouteNames.TREE_VIEW,
       path: '/:nodeId/:detailNodeId?',
       props: true,
       component: TreeView,
diff --git a/contentcuration/contentcuration/frontend/channelEdit/utils.js b/contentcuration/contentcuration/frontend/channelEdit/utils.js
index cacbd9dcd1..d4b3323535 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/utils.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/utils.js
@@ -1,5 +1,5 @@
 import translator from './translator';
-import { RouterNames } from './constants';
+import { RouteNames } from './constants';
 import { AssessmentItemTypes } from 'shared/constants';
 
 /**
@@ -132,7 +132,7 @@ export function importedChannelLink(node, router) {
   if (node && isImportedContent(node)) {
     const channelURI = window.Urls.channel(node.original_channel_id);
     const sourceNodeRoute = router.resolve({
-      name: RouterNames.ORIGINAL_SOURCE_NODE_IN_TREE_VIEW,
+      name: RouteNames.ORIGINAL_SOURCE_NODE_IN_TREE_VIEW,
       params: { originalSourceNodeId: node.original_source_node_id },
     });
     return `${channelURI + sourceNodeRoute.href}`;
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/CurrentTopicView.vue b/contentcuration/contentcuration/frontend/channelEdit/views/CurrentTopicView.vue
index 54339cf669..424f2fbd9c 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/CurrentTopicView.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/CurrentTopicView.vue
@@ -231,7 +231,7 @@
 
   import { mapActions, mapGetters, mapState } from 'vuex';
   import get from 'lodash/get';
-  import { RouterNames, viewModes, DraggableRegions, DraggableUniverses } from '../constants';
+  import { RouteNames, viewModes, DraggableRegions, DraggableUniverses } from '../constants';
   import ResourceDrawer from '../components/ResourceDrawer';
   import ContentNodeOptions from '../components/ContentNodeOptions';
   import MoveModal from '../components/move/MoveModal';
@@ -345,14 +345,14 @@
         return this.getContentNodeChildren(this.topicId);
       },
       uploadFilesLink() {
-        return { name: RouterNames.UPLOAD_FILES };
+        return { name: RouteNames.UPLOAD_FILES };
       },
       viewModes() {
         return Object.values(viewModes);
       },
       importFromChannelsRoute() {
         return {
-          name: RouterNames.IMPORT_FROM_CHANNELS_BROWSE,
+          name: RouteNames.IMPORT_FROM_CHANNELS_BROWSE,
           params: {
             destNodeId: this.$route.params.nodeId,
           },
@@ -449,7 +449,7 @@
           kind: ContentKindsNames.TOPIC,
           title: '',
         };
-        this.newContentNode(RouterNames.ADD_TOPICS, nodeData);
+        this.newContentNode(RouteNames.ADD_TOPICS, nodeData);
         this.trackClickEvent('Add topics');
       },
       newExerciseNode() {
@@ -457,13 +457,13 @@
           kind: ContentKindsNames.EXERCISE,
           title: '',
         };
-        this.newContentNode(RouterNames.ADD_EXERCISE, nodeData);
+        this.newContentNode(RouteNames.ADD_EXERCISE, nodeData);
         this.trackClickEvent('Add exercise');
       },
       editNodes(ids) {
         this.trackClickEvent('Edit');
         this.$router.push({
-          name: RouterNames.CONTENTNODE_DETAILS,
+          name: RouteNames.CONTENTNODE_DETAILS,
           params: {
             detailNodeIds: ids.join(','),
           },
@@ -471,13 +471,13 @@
       },
       treeLink(params) {
         return {
-          name: RouterNames.TREE_VIEW,
+          name: RouteNames.TREE_VIEW,
           params,
         };
       },
       closePanel() {
         this.$router.push({
-          name: RouterNames.TREE_VIEW,
+          name: RouteNames.TREE_VIEW,
           params: {
             nodeId: this.$route.params.nodeId,
             detailNodeId: null,
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/BrowsingCard.vue b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/BrowsingCard.vue
index 6ac3d0a8b8..d8e3a30a30 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/BrowsingCard.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/BrowsingCard.vue
@@ -98,7 +98,7 @@
 
   export default {
     name: 'BrowsingCard',
-    inject: ['RouterNames'],
+    inject: ['RouteNames'],
     components: {
       IconButton,
       Thumbnail,
@@ -131,7 +131,7 @@
       },
       topicRoute() {
         return {
-          name: this.RouterNames.IMPORT_FROM_CHANNELS_BROWSE,
+          name: this.RouteNames.IMPORT_FROM_CHANNELS_BROWSE,
           params: {
             nodeId: this.node.id,
             channelId: this.inSearch ? this.node.channel_id : this.$route.params.channelId,
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ChannelInfoCard.vue b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ChannelInfoCard.vue
index e1edcd4a03..88bb151b1a 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ChannelInfoCard.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ChannelInfoCard.vue
@@ -53,7 +53,7 @@
 
   export default {
     name: 'ChannelInfoCard',
-    inject: ['RouterNames'],
+    inject: ['RouteNames'],
     components: { Thumbnail, ToggleText },
     mixins: [constantsTranslationMixin],
     props: {
@@ -68,7 +68,7 @@
       },
       channelRoute() {
         return {
-          name: this.RouterNames.IMPORT_FROM_CHANNELS_BROWSE,
+          name: this.RouteNames.IMPORT_FROM_CHANNELS_BROWSE,
           params: {
             channelId: this.channel.id,
             nodeId: this.channel.root_id,
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ContentTreeList.vue b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ContentTreeList.vue
index f100f27021..c9f3a23236 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ContentTreeList.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ContentTreeList.vue
@@ -55,7 +55,7 @@
   import intersectionBy from 'lodash/intersectionBy';
   import { mapActions, mapGetters } from 'vuex';
   import find from 'lodash/find';
-  import { RouterNames } from '../../constants';
+  import { RouteNames } from '../../constants';
   import BrowsingCard from './BrowsingCard';
   import Breadcrumbs from 'shared/views/Breadcrumbs';
   import Checkbox from 'shared/views/form/Checkbox';
@@ -121,7 +121,7 @@
           return {
             text: ancestor.title,
             to: {
-              name: RouterNames.IMPORT_FROM_CHANNELS_BROWSE,
+              name: RouteNames.IMPORT_FROM_CHANNELS_BROWSE,
               params: {
                 channelId: this.$route.params.channelId,
                 nodeId: ancestor.id,
@@ -133,7 +133,7 @@
           {
             text: this.$tr('allChannelsLabel'),
             to: {
-              name: RouterNames.IMPORT_FROM_CHANNELS_BROWSE,
+              name: RouteNames.IMPORT_FROM_CHANNELS_BROWSE,
               params: {},
               query: this.$route.query,
             },
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ImportFromChannelsModal.vue b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ImportFromChannelsModal.vue
index f7367253e1..96a8bba3ec 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ImportFromChannelsModal.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ImportFromChannelsModal.vue
@@ -76,16 +76,16 @@
 
   import { mapActions, mapMutations, mapState } from 'vuex';
   import sumBy from 'lodash/sumBy';
-  import { RouterNames } from '../../constants';
+  import { RouteNames } from '../../constants';
   import ResourceDrawer from '../../components/ResourceDrawer';
   import { routerMixin } from 'shared/mixins';
   import FullscreenModal from 'shared/views/FullscreenModal';
 
   const IMPORT_ROUTES = [
-    RouterNames.IMPORT_FROM_CHANNELS,
-    RouterNames.IMPORT_FROM_CHANNELS_BROWSE,
-    RouterNames.IMPORT_FROM_CHANNELS_SEARCH,
-    RouterNames.IMPORT_FROM_CHANNELS_REVIEW,
+    RouteNames.IMPORT_FROM_CHANNELS,
+    RouteNames.IMPORT_FROM_CHANNELS_BROWSE,
+    RouteNames.IMPORT_FROM_CHANNELS_SEARCH,
+    RouteNames.IMPORT_FROM_CHANNELS_REVIEW,
   ];
 
   function getResourceCount(node) {
@@ -110,7 +110,7 @@
       };
     },
     provide: {
-      RouterNames,
+      RouteNames,
     },
     computed: {
       ...mapState('importFromChannels', ['selected']),
@@ -136,7 +136,7 @@
       },
       backLink() {
         return {
-          name: RouterNames.TREE_VIEW,
+          name: RouteNames.TREE_VIEW,
           params: {
             nodeId: this.$route.params.destNodeId,
           },
@@ -147,7 +147,7 @@
           return { path: this.$route.query.last, query: this.$route.query };
         }
         return {
-          name: RouterNames.IMPORT_FROM_CHANNELS_BROWSE,
+          name: RouteNames.IMPORT_FROM_CHANNELS_BROWSE,
           query: this.$route.query,
         };
       },
@@ -155,7 +155,7 @@
         return sumBy(this.selected, getResourceCount);
       },
       isReview() {
-        return this.$route.name === RouterNames.IMPORT_FROM_CHANNELS_REVIEW;
+        return this.$route.name === RouteNames.IMPORT_FROM_CHANNELS_REVIEW;
       },
       headerText() {
         return this.isReview ? this.$tr('reviewTitle') : this.$tr('importTitle');
@@ -201,7 +201,7 @@
       },
       handleClickReview() {
         this.$router.push({
-          name: RouterNames.IMPORT_FROM_CHANNELS_REVIEW,
+          name: RouteNames.IMPORT_FROM_CHANNELS_REVIEW,
           query: {
             ...this.$route.query,
             last: this.$route.path,
@@ -218,7 +218,7 @@
           this.showSnackbar = false;
           this.$store.commit('importFromChannels/CLEAR_NODES');
           this.$router.push({
-            name: RouterNames.TREE_VIEW,
+            name: RouteNames.TREE_VIEW,
             params: {
               nodeId: this.$route.params.destNodeId,
             },
@@ -233,10 +233,9 @@
       updateTitleForPage() {
         // NOTE: Tab title for ReviewSelectionPage is handled in that component
         if (
-          [
-            RouterNames.IMPORT_FROM_CHANNELS_BROWSE,
-            RouterNames.IMPORT_FROM_CHANNELS_SEARCH,
-          ].includes(this.$route.name)
+          [RouteNames.IMPORT_FROM_CHANNELS_BROWSE, RouteNames.IMPORT_FROM_CHANNELS_SEARCH].includes(
+            this.$route.name
+          )
         ) {
           this.updateTabTitle(this.$store.getters.appendChannelName(this.$tr('importTitle')));
         }
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SavedSearchesModal.vue b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SavedSearchesModal.vue
index 39e034708e..33ed8a20f0 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SavedSearchesModal.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SavedSearchesModal.vue
@@ -1,57 +1,60 @@
 <template>
 
-  <ResponsiveDialog
-    v-model="dialog"
-    width="600px"
-    :header="$tr('savedSearchesTitle')"
-  >
-    <LoadingText v-if="loading" />
-    <p v-else-if="savedSearches.length === 0" class="grey--text pa-2">
-      {{ $tr('noSavedSearches') }}
-    </p>
-    <VList v-else>
-      <template v-for="(search, index) in savedSearches">
-        <VListTile :key="index" class="py-2">
-          <VListTileContent>
-            <VListTileTitle>
-              <ActionLink
-                class="font-weight-bold"
-                :to="searchResultsRoute(search)"
-                :text="search.name"
-                @click="dialog = false"
+  <div>
+    <KModal
+      v-if="dialog"
+      :title="$tr('savedSearchesTitle')"
+      :cancelText="$tr('closeButtonLabel')"
+      @cancel="dialog = false"
+    >
+      <KCircularLoader v-if="loading" :size="40" />
+      <p v-else-if="savedSearches.length === 0" class="grey--text pa-2">
+        {{ $tr('noSavedSearches') }}
+      </p>
+      <VList v-else>
+        <template v-for="(search, index) in savedSearches">
+          <VListTile :key="index" class="py-2">
+            <VListTileContent>
+              <VListTileTitle>
+                <ActionLink
+                  class="font-weight-bold"
+                  :to="searchResultsRoute(search)"
+                  :text="search.name"
+                  @click="dialog = false"
+                />
+              </VListTileTitle>
+              <VListTileSubTitle class="metadata">
+                <span>
+                  {{ $formatRelative(search.created, { now: new Date() }) }}
+                </span>
+                <span>
+                  {{ $tr('filterCount', { count: searchFilterCount(search) }) }}
+                </span>
+              </VListTileSubTitle>
+            </VListTileContent>
+
+            <VListTileAction>
+              <IconButton
+                icon="edit"
+                color="grey"
+                :text="$tr('editAction')"
+                @click="handleClickEdit(search.id)"
               />
-            </VListTileTitle>
-            <VListTileSubTitle class="metadata">
-              <span>
-                {{ $formatRelative(search.created, { now: new Date() }) }}
-              </span>
-              <span>
-                {{ $tr('filterCount', { count: searchFilterCount(search) }) }}
-              </span>
-            </VListTileSubTitle>
-          </VListTileContent>
-
-          <VListTileAction>
-            <IconButton
-              icon="edit"
-              color="grey"
-              :text="$tr('editAction')"
-              @click="handleClickEdit(search.id)"
-            />
-          </VListTileAction>
-
-          <VListTileAction>
-            <IconButton
-              icon="clear"
-              color="grey"
-              :text="$tr('deleteAction')"
-              @click="handleClickDelete(search.id)"
-            />
-          </VListTileAction>
-        </VListTile>
-        <VDivider v-if="index < savedSearches.length - 1" :key="index + 'divider'" />
-      </template>
-    </VList>
+            </VListTileAction>
+
+            <VListTileAction>
+              <IconButton
+                icon="clear"
+                color="grey"
+                :text="$tr('deleteAction')"
+                @click="handleClickDelete(search.id)"
+              />
+            </VListTileAction>
+          </VListTile>
+          <VDivider v-if="index < savedSearches.length - 1" :key="index + 'divider'" />
+        </template>
+      </VList>
+    </KModal>
 
     <MessageDialog
       v-model="showDelete"
@@ -75,7 +78,7 @@
       @submit="showEdit = false"
       @cancel="showEdit = false"
     />
-  </ResponsiveDialog>
+  </div>
 
 </template>
 
@@ -86,18 +89,14 @@
   import EditSearchModal from './EditSearchModal';
   import MessageDialog from 'shared/views/MessageDialog';
   import IconButton from 'shared/views/IconButton';
-  import LoadingText from 'shared/views/LoadingText';
-  import ResponsiveDialog from 'shared/views/ResponsiveDialog';
 
   export default {
     name: 'SavedSearchesModal',
-    inject: ['RouterNames'],
+    inject: ['RouteNames'],
     components: {
       EditSearchModal,
       MessageDialog,
       IconButton,
-      LoadingText,
-      ResponsiveDialog,
     },
     props: {
       value: {
@@ -158,7 +157,7 @@
         delete query.keywords;
 
         return {
-          name: this.RouterNames.IMPORT_FROM_CHANNELS_SEARCH,
+          name: this.RouteNames.IMPORT_FROM_CHANNELS_SEARCH,
           params: {
             ...this.$route.params,
             searchTerm,
@@ -178,6 +177,7 @@
       },
     },
     $trs: {
+      closeButtonLabel: 'Close',
       editAction: 'Edit',
       deleteAction: 'Delete',
       savedSearchesTitle: 'Saved searches',
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchOrBrowseWindow.vue b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchOrBrowseWindow.vue
index b5348aafb2..12df7f6cd2 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchOrBrowseWindow.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchOrBrowseWindow.vue
@@ -76,7 +76,7 @@
 <script>
 
   import { mapActions, mapMutations, mapState } from 'vuex';
-  import { RouterNames } from '../../constants';
+  import { RouteNames } from '../../constants';
   import ChannelList from './ChannelList';
   import ContentTreeList from './ContentTreeList';
   import SearchResultsList from './SearchResultsList';
@@ -101,7 +101,7 @@
     computed: {
       ...mapState('importFromChannels', ['selected']),
       isBrowsing() {
-        return this.$route.name === RouterNames.IMPORT_FROM_CHANNELS_BROWSE;
+        return this.$route.name === RouteNames.IMPORT_FROM_CHANNELS_BROWSE;
       },
       backToBrowseRoute() {
         const query = {
@@ -111,7 +111,7 @@
           return { path: this.$route.query.last, query };
         }
         return {
-          name: RouterNames.IMPORT_FROM_CHANNELS_BROWSE,
+          name: RouteNames.IMPORT_FROM_CHANNELS_BROWSE,
           query,
         };
       },
@@ -124,7 +124,7 @@
     },
     beforeRouteLeave(to, from, next) {
       // Clear selections if going back to TreeView
-      if (to.name === RouterNames.TREE_VIEW) {
+      if (to.name === RouteNames.TREE_VIEW) {
         this.$store.commit('importFromChannels/CLEAR_NODES');
       }
       next();
@@ -145,7 +145,7 @@
       handleSearchTerm() {
         if (this.searchIsValid) {
           this.$router.push({
-            name: RouterNames.IMPORT_FROM_CHANNELS_SEARCH,
+            name: RouteNames.IMPORT_FROM_CHANNELS_SEARCH,
             params: {
               searchTerm: this.searchTerm.trim(),
             },
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/NodePanel.vue b/contentcuration/contentcuration/frontend/channelEdit/views/NodePanel.vue
index 6a81357701..a177fc6474 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/NodePanel.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/NodePanel.vue
@@ -52,7 +52,7 @@
 
   import { mapActions, mapGetters } from 'vuex';
 
-  import { RouterNames } from '../constants';
+  import { RouteNames } from '../constants';
   import ContentNodeEditListItem from '../components/ContentNodeEditListItem';
   import { ContentKindsNames } from 'shared/leUtils/ContentKinds';
   import LoadingText from 'shared/views/LoadingText';
@@ -112,7 +112,7 @@
         }
 
         this.$router.push({
-          name: RouterNames.TREE_VIEW,
+          name: RouteNames.TREE_VIEW,
           params: {
             nodeId: this.parentId,
             detailNodeId: nodeId,
@@ -125,7 +125,7 @@
         }
 
         this.$router.push({
-          name: RouterNames.TREE_VIEW,
+          name: RouteNames.TREE_VIEW,
           params: {
             nodeId: topicId,
             detailNodeId: null,
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue b/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue
index 89eac12ab1..4f5b4804a5 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue
@@ -164,7 +164,7 @@
     <slot></slot>
 
     <PublishModal v-if="showPublishModal" v-model="showPublishModal" />
-    <ProgressModal v-model="showProgressModal" :syncing="syncing" :noSyncNeeded="noSyncNeeded" />
+    <ProgressModal :syncing="syncing" :noSyncNeeded="noSyncNeeded" />
     <template v-if="isPublished">
       <ChannelTokenModal v-model="showTokenModal" :channel="currentChannel" />
     </template>
@@ -244,7 +244,7 @@
 <script>
 
   import { mapActions, mapGetters } from 'vuex';
-  import { DraggableRegions, DraggableUniverses, RouterNames } from '../../constants';
+  import { DraggableRegions, DraggableUniverses, RouteNames } from '../../constants';
   import PublishModal from '../../components/publish/PublishModal';
   import ProgressModal from '../progress/ProgressModal';
   import SyncResourcesModal from '../sync/SyncResourcesModal';
@@ -256,7 +256,7 @@
   import OfflineText from 'shared/views/OfflineText';
   import ContentNodeIcon from 'shared/views/ContentNodeIcon';
   import MessageDialog from 'shared/views/MessageDialog';
-  import { RouterNames as ChannelRouterNames } from 'frontend/channelList/constants';
+  import { RouteNames as ChannelRouteNames } from 'frontend/channelList/constants';
   import { titleMixin } from 'shared/mixins';
   import DraggableRegion from 'shared/views/draggable/DraggableRegion';
   import { DropEffect } from 'shared/mixins/draggable/constants';
@@ -286,7 +286,6 @@
         showPublishModal: false,
         showTokenModal: false,
         showSyncModal: false,
-        showProgressModal: false,
         showClipboard: false,
         showDeleteModal: false,
         syncing: false,
@@ -339,7 +338,7 @@
       },
       viewChannelDetailsLink() {
         return {
-          name: ChannelRouterNames.CHANNEL_DETAILS,
+          name: ChannelRouteNames.CHANNEL_DETAILS,
           query: {
             last: this.$route.name,
           },
@@ -351,7 +350,7 @@
       },
       editChannelLink() {
         return {
-          name: ChannelRouterNames.CHANNEL_EDIT,
+          name: ChannelRouteNames.CHANNEL_EDIT,
           query: {
             last: this.$route.name,
           },
@@ -364,13 +363,13 @@
       },
       trashLink() {
         return {
-          name: RouterNames.TRASH,
+          name: RouteNames.TRASH,
           params: this.$route.params,
         };
       },
       shareChannelLink() {
         return {
-          name: ChannelRouterNames.CHANNEL_EDIT,
+          name: ChannelRouteNames.CHANNEL_EDIT,
           params: {
             channelId: this.currentChannel.id,
             tab: 'share',
@@ -381,7 +380,7 @@
         };
       },
       showClipboardSpeedDial() {
-        return this.$route.name !== RouterNames.STAGING_TREE_VIEW;
+        return this.$route.name !== RouteNames.STAGING_TREE_VIEW;
       },
       draggableUniverse() {
         return DraggableUniverses.CONTENT_NODES;
@@ -407,11 +406,9 @@
       },
       syncInProgress() {
         this.syncing = true;
-        this.showProgressModal = true;
       },
       noResourcesToSync() {
         this.noSyncNeeded = true;
-        this.showProgressModal = true;
       },
       deleteChannelModal() {
         this.showDeleteModal = true;
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/index.spec.js b/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/index.spec.js
index aa6f484088..470e67a89d 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/index.spec.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/index.spec.js
@@ -3,7 +3,7 @@ import Vuex, { Store } from 'vuex';
 import VueRouter from 'vue-router';
 import cloneDeep from 'lodash/cloneDeep';
 
-import { RouterNames } from '../../constants';
+import { RouteNames } from '../../constants';
 import TreeView from './index';
 
 const localVue = createLocalVue();
@@ -50,7 +50,7 @@ const initWrapper = ({ getters = GETTERS, actions = ACTIONS, mutations = MUTATIO
   const router = new VueRouter({
     routes: [
       {
-        name: RouterNames.STAGING_TREE_VIEW,
+        name: RouteNames.STAGING_TREE_VIEW,
         path: '/staging/:nodeId/:detailNodeId?',
       },
     ],
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/index.vue b/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/index.vue
index c13267460e..97aae4d603 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/index.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/index.vue
@@ -138,7 +138,7 @@
 <script>
 
   import { mapActions, mapGetters, mapMutations } from 'vuex';
-  import { RouterNames, DraggableRegions, DraggableUniverses } from '../../constants';
+  import { RouteNames, DraggableRegions, DraggableUniverses } from '../../constants';
   import StudioTree from '../../components/StudioTree/StudioTree';
   import CurrentTopicView from '../CurrentTopicView';
   import TreeViewBase from './TreeViewBase';
@@ -222,7 +222,7 @@
       },
       stagingTreeLink() {
         return {
-          name: RouterNames.STAGING_TREE_VIEW,
+          name: RouteNames.STAGING_TREE_VIEW,
           params: {
             nodeId: this.stagingId,
           },
@@ -251,7 +251,7 @@
       pageNotFoundBackHomeLink() {
         return {
           to: {
-            name: RouterNames.TREE_ROOT_VIEW,
+            name: RouteNames.TREE_ROOT_VIEW,
           },
         };
       },
@@ -319,7 +319,7 @@
           return;
         }
         this.$router.push({
-          name: RouterNames.TREE_VIEW,
+          name: RouteNames.TREE_VIEW,
           params: {
             nodeId,
           },
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/progress/ProgressModal.vue b/contentcuration/contentcuration/frontend/channelEdit/views/progress/ProgressModal.vue
index 2bf42e04a1..ad7ddf91ac 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/progress/ProgressModal.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/progress/ProgressModal.vue
@@ -1,86 +1,60 @@
 <template>
 
-  <div>
-    <VDialog
-      v-if="isSyncing || nothingToSync || isPublishing"
-      :value="true"
-      persistent
-      :width="575"
-      attach="body"
-      data-test="progressmodal"
+  <div v-if="isSyncing || nothingToSync || isPublishing">
+    <KModal
+      v-if="!displayCancelModal"
+      data-test="progress-modal"
+      :title="progressModalTitle"
     >
-      <VCard class="pa-3">
-        <VWindow v-model="step">
-          <VWindowItem :value="1">
-            <VCardTitle class="font-weight-bold pb-0 title">
-              {{ headerText }}
-            </VCardTitle>
-            <VCardText class="py-4">
-              <p class="body-1">
-                {{ descriptionText }}
-              </p>
-              <ProgressBar
-                v-if="!nothingToSync"
-                :progressPercent="progressPercent"
-                :currentTaskError="currentTaskError"
-              />
-              <VLayout
-                v-if="currentTaskError"
-                row
-                class="caption mt-2 red--text"
-                data-test="error"
-              >
-                <VFlex class="pr-2">
-                  <Icon small color="red">
-                    error
-                  </Icon>
-                </VFlex>
-                <VFlex>{{ $tr('defaultErrorText') }}</VFlex>
-              </VLayout>
-            </VCardText>
+      {{ progressModalDescription }}
 
-            <VCardActions>
-              <VSpacer />
-              <VBtn
-                v-if="progressPercent === 100 || currentTaskError"
-                color="primary"
-                data-test="refresh"
-                @click="cancelTaskAndClose(currentTask)"
-              >
-                {{ doneButtonText || $tr('refreshButton') }}
-              </VBtn>
-              <VBtn v-else color="primary" data-test="stop" @click="step++">
-                {{ stopButtonText || $tr('stopButton') }}
-              </VBtn>
-            </VCardActions>
-          </VWindowItem>
+      <ProgressBar
+        v-if="!nothingToSync"
+        data-test="progress-bar"
+        :progressPercent="progressPercent"
+        :currentTaskError="currentTaskError"
+      />
+      <div
+        v-if="currentTaskError"
+        class="caption mt-2 red--text"
+      >
+        <Icon small color="red">
+          error
+        </Icon>
+        {{ $tr('defaultErrorText') }}
+      </div>
 
-          <VWindowItem :value="2">
-            <VCardTitle class="font-weight-bold pb-0 title">
-              {{ cancelHeaderText || $tr('cancelHeader') }}
-            </VCardTitle>
-            <VCardText class="py-4">
-              {{ cancelText || $tr('cancelText') }}
-            </VCardText>
-
-            <VCardActions>
-              <VSpacer />
-              <VBtn flat data-test="cancelstop" @click="step--">
-                {{ $tr('cancel') }}
-              </VBtn>
-              <VBtn
-                color="primary"
-                data-test="confirmstop"
-                @click="cancelTaskAndClose(currentTask)"
-              >
-                {{ stopButtonText || $tr('confirmStopButton') }}
-              </VBtn>
-            </VCardActions>
-          </VWindowItem>
-        </VWindow>
-      </VCard>
-    </VDialog>
+      <template slot="actions">
+        <KButton
+          v-if="isFinished || currentTaskError"
+          primary
+          data-test="refresh-button"
+          @click="cancelTaskAndClose(currentTask)"
+        >
+          {{ $tr('refreshButton') }}
+        </KButton>
+        <KButton
+          v-else
+          primary
+          data-test="stop-button"
+          @click="displayCancelModal = true"
+        >
+          {{ $tr('stopButton') }}
+        </KButton>
+      </template>
+    </KModal>
 
+    <KModal
+      v-else
+      data-test="cancel-modal"
+      :title="$tr('cancelHeader')"
+      :submitText="$tr('confirmStopButton')"
+      :cancelText="$tr('cancel')"
+      @submit="cancelTaskAndClose(currentTask)"
+      @cancel="displayCancelModal = false"
+    >
+      {{ $tr('cancelText') }}
+    </KModal>
   </div>
 
 </template>
@@ -97,22 +71,6 @@
       ProgressBar,
     },
     props: {
-      doneButtonText: {
-        type: String,
-        default: '',
-      },
-      stopButtonText: {
-        type: String,
-        default: '',
-      },
-      cancelHeaderText: {
-        type: String,
-        default: '',
-      },
-      cancelText: {
-        type: String,
-        default: '',
-      },
       syncing: {
         type: Boolean,
         default: false,
@@ -124,12 +82,12 @@
     },
     data() {
       return {
-        step: 1,
+        displayCancelModal: false,
       };
     },
     computed: {
       ...mapGetters('task', ['currentTasksForChannel']),
-      ...mapGetters('currentChannel', ['currentChannel']),
+      ...mapGetters('currentChannel', ['currentChannel', 'canManage']),
       currentTasks() {
         return this.currentTasksForChannel(this.currentChannel.id) || null;
       },
@@ -144,7 +102,12 @@
         return this.isSyncing && this.noSyncNeeded;
       },
       isPublishing() {
-        return this.currentChannel && this.currentChannel.publishing;
+        // add condition so that publishing modal is only visible for users
+        // who have channel publishing permissions
+        if (this.canManage) {
+          return this.currentChannel && this.currentChannel.publishing;
+        }
+        return false;
       },
       currentTask() {
         if (this.isSyncing) {
@@ -161,28 +124,38 @@
         }
         return get(this.currentTask, ['metadata', 'progress'], 0);
       },
+      isFinished() {
+        return this.progressPercent >= 100;
+      },
       currentTaskError() {
         return Boolean(
           get(this.currentTask, ['metadata', 'error'], null) ||
             get(this.currentTask, 'status') === 'FAILURE'
         );
       },
-      headerText() {
-        if ((this.currentTask && this.isPublishing) || this.currentChannel.publishing) {
+      progressModalTitle() {
+        if (this.isPublishing) {
           return this.$tr('publishHeader');
-        } else if (this.syncing || (this.currentTask && this.isSyncing)) {
+        }
+        if (this.isSyncing || this.nothingToSync) {
           return this.$tr('syncHeader');
         }
         return '';
       },
-      descriptionText() {
-        if (this.progressPercent >= 100 || this.nothingToSync) {
+      progressModalDescription() {
+        if (this.isPublishing) {
+          return this.$tr('publishDescription');
+        }
+        if (this.isFinished && (this.isSyncing || this.nothingToSync)) {
           return this.$tr('finishedMessage');
         } else if ((this.currentTask && this.isPublishing) || this.currentChannel.publishing) {
           return this.$tr('publishDescription');
         } else if (this.syncing || (this.currentTask && this.isSyncing)) {
           return this.$tr('syncDescription');
         }
+        if (this.isSyncing || this.nothingToSync) {
+          return this.$tr('syncDescription');
+        }
         return '';
       },
     },
@@ -195,8 +168,6 @@
       },
     },
     $trs: {
-      // copyHeader: 'Importing resources',
-      // copyDescription: 'Import is in progress, please wait...',
       /* eslint-disable kolibri/vue-no-unused-translations */
       defaultHeader: 'Updating channel',
       defaultDescription: 'Update is in progress, please wait...',
@@ -204,8 +175,6 @@
       defaultErrorText:
         'An unexpected error has occurred. Please try again, and if you continue to see this message, please contact support via the Help menu.',
       finishedMessage: 'Operation complete! Click "Refresh" to update the page.',
-      // moveHeader: 'Moving Content',
-      // moveDescription: 'Move operation is in progress, please wait...',
       publishHeader: 'Publishing channel',
       publishDescription:
         'Once publishing is complete, you will receive an email notification and will be able to make further edits to your channel.',
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 ae07943e4e..498d958b7f 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/progress/__tests__/progressModal.spec.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/progress/__tests__/progressModal.spec.js
@@ -1,114 +1,409 @@
 import { mount } from '@vue/test-utils';
-import ProgressModal from '../ProgressModal';
-import { factory } from '../../../store';
+import cloneDeep from 'lodash/cloneDeep';
 
-const store = factory();
+import ProgressModal from '../ProgressModal';
+import { STORE_CONFIG } from '../../../store';
+import storeFactory from 'shared/vuex/baseStore';
+import { resetJestGlobal } from 'shared/utils/testing';
 
-const task = { task: { id: 123, task_type: 'test-task' } };
-const tasks = [
-  { task: { id: 123, task_type: 'test-task' } },
-  { task: { id: 456, task_type: 'test-task-2' } },
-];
+const PUBLISH_TASK = {
+  id: 'id-publish-task',
+  task_type: 'export-channel',
+  metadata: { progress: 0 },
+};
+const SYNC_TASK = { id: 'id-sync-task', task_type: 'sync-channel', metadata: { progress: 0 } };
 
-function makeWrapper(computed = {}) {
+function makeWrapper({ propsData, store }) {
   return mount(ProgressModal, {
+    propsData,
     store,
-    computed: {
-      currentTasks() {
-        return tasks;
-      },
-      currentTask() {
-        return task;
-      },
-      isPublishing() {
-        return true;
-      },
-      ...computed,
-    },
   });
 }
 
-describe('progressModal', () => {
+function getProgressModal(wrapper) {
+  return wrapper.find('[data-test="progress-modal"]');
+}
+
+function getCancelModal(wrapper) {
+  return wrapper.find('[data-test="cancel-modal"]');
+}
+
+function getProgressBar(wrapper) {
+  return wrapper.find('[data-test="progress-bar"]');
+}
+
+function getStopButton(wrapper) {
+  return wrapper.find('[data-test="stop-button"]');
+}
+
+function getCancelStopButton(wrapper) {
+  return wrapper.find('[data-test="cancel-modal"]').find('[name="cancel"]');
+}
+
+function getRefreshButton(wrapper) {
+  return wrapper.find('[data-test="refresh-button"]');
+}
+
+describe('ProgressModal', () => {
+  let pageReload;
+
+  beforeEach(() => {
+    pageReload = jest.fn();
+    global.location.reload = pageReload;
+  });
+
+  afterEach(() => {
+    jest.resetAllMocks();
+    resetJestGlobal();
+  });
+
+  it('smoke test', () => {
+    const store = storeFactory(STORE_CONFIG);
+    const wrapper = makeWrapper({ store });
+
+    expect(wrapper.isVueInstance()).toBe(true);
+  });
+
   it('should be hidden if the user is not syncing or publishing', () => {
-    let wrapper = makeWrapper({
-      isSyncing() {
-        return false;
-      },
-      nothingToSync() {
-        return false;
-      },
-      isPublishing() {
-        return false;
-      },
-    });
-    expect(wrapper.find('[data-test="progressmodal"]').exists()).toBe(false);
+    const propsData = {
+      syncing: false,
+    };
+    const storeConfig = cloneDeep(STORE_CONFIG);
+    jest
+      .spyOn(storeConfig.modules.currentChannel.getters, 'currentChannel')
+      .mockReturnValue({ publishing: false });
+    const store = storeFactory(storeConfig);
+    const wrapper = makeWrapper({ propsData, store });
+
+    expect(getProgressModal(wrapper).exists()).toBe(false);
+    expect(getCancelModal(wrapper).exists()).toBe(false);
   });
-  it('should show an error if the task failed', () => {
-    let wrapper = makeWrapper({
-      currentTaskError() {
-        return { data: 'nope' };
-      },
+
+  describe('when publishing as a user with publish permissions', () => {
+    let storeConfig, stopTask;
+
+    beforeEach(() => {
+      storeConfig = cloneDeep(STORE_CONFIG);
+      jest
+        .spyOn(storeConfig.modules.currentChannel.getters, 'currentChannel')
+        .mockReturnValue({ publishing: true });
+      jest
+        .spyOn(storeConfig.modules.currentChannel.getters, 'canManage')
+        .mockReturnValue({ canManage: true });
+      stopTask = jest
+        .spyOn(storeConfig.modules.currentChannel.actions, 'stopTask')
+        .mockResolvedValue();
     });
-    expect(wrapper.find('[data-test="error"]').exists()).toBe(true);
-  });
-  it('refresh button should be shown if task is done', () => {
-    let wrapper = makeWrapper({
-      progressPercent() {
-        return 100;
-      },
+
+    it('progress modal should be displayed', () => {
+      const store = storeFactory(storeConfig);
+      const wrapper = makeWrapper({ store });
+
+      expect(getProgressModal(wrapper).exists()).toBe(true);
+      expect(getCancelModal(wrapper).exists()).toBe(false);
     });
-    expect(wrapper.find('[data-test="refresh"]').exists()).toBe(true);
-  });
-  it('refresh button should be shown if task failed', () => {
-    let wrapper = makeWrapper({
-      currentTaskError() {
-        return { data: 'uh-oh!' };
-      },
+
+    describe('is in progress', () => {
+      let wrapper;
+
+      beforeEach(() => {
+        const store = storeFactory(storeConfig);
+        wrapper = makeWrapper({ store });
+      });
+
+      it('should display publishing message', () => {
+        expect(getProgressModal(wrapper).text()).toContain(
+          'Once publishing is complete, you will receive an email notification and will be able to make further edits to your channel.'
+        );
+      });
+
+      it('should display progress bar', () => {
+        expect(getProgressBar(wrapper).exists()).toBe(true);
+      });
+
+      it("shouldn't display refresh button", () => {
+        expect(getRefreshButton(wrapper).exists()).toBe(false);
+      });
+
+      it('should display stop button', () => {
+        expect(getStopButton(wrapper).exists()).toBe(true);
+      });
+
+      it('clicking stop button should switch to cancel modal', () => {
+        getStopButton(wrapper).trigger('click');
+
+        expect(getCancelModal(wrapper).exists()).toBe(true);
+        expect(getProgressModal(wrapper).exists()).toBe(false);
+      });
+
+      it('cancelling the cancel modal should go back to progress modal', () => {
+        getStopButton(wrapper).trigger('click');
+        expect(getCancelModal(wrapper).exists()).toBe(true);
+
+        getCancelStopButton(wrapper).trigger('click');
+        expect(getCancelModal(wrapper).exists()).toBe(false);
+        expect(getProgressModal(wrapper).exists()).toBe(true);
+      });
+
+      it('confirmation of the cancel modal should stop publishing and reload the page', async () => {
+        // open the cancel modal
+        getStopButton(wrapper).trigger('click');
+        // confirm stop publishing
+        getCancelModal(wrapper)
+          .find('form')
+          .trigger('submit');
+
+        expect(stopTask).toHaveBeenCalledTimes(1);
+        await wrapper.vm.$nextTick();
+        expect(pageReload).toHaveBeenCalledTimes(1);
+      });
+    });
+
+    describe('errored out', () => {
+      let wrapper;
+
+      beforeEach(() => {
+        const publishTask = cloneDeep(PUBLISH_TASK);
+        publishTask.status = 'FAILURE';
+        const store = storeFactory(storeConfig);
+        store.commit('task/ADD_ASYNC_TASK', publishTask);
+        wrapper = makeWrapper({ store });
+      });
+
+      it('should display an error message', () => {
+        expect(wrapper.text()).toContain('An unexpected error has occurred');
+      });
+
+      it('should display progress bar', () => {
+        expect(getProgressBar(wrapper).exists()).toBe(true);
+      });
+
+      it("shouldn't display stop button", () => {
+        expect(getStopButton(wrapper).exists()).toBe(false);
+      });
+
+      it('should display refresh button', () => {
+        expect(getRefreshButton(wrapper).exists()).toBe(true);
+      });
+
+      it('clicking on refresh button should stop publishing and reload the page', async () => {
+        getRefreshButton(wrapper).trigger('click');
+
+        expect(stopTask).toHaveBeenCalledTimes(1);
+        await wrapper.vm.$nextTick();
+        expect(pageReload).toHaveBeenCalledTimes(1);
+      });
+    });
+
+    describe('is complete', () => {
+      let wrapper;
+
+      beforeEach(() => {
+        const publishTask = cloneDeep(PUBLISH_TASK);
+        publishTask.metadata.progress = 100;
+        const store = storeFactory(storeConfig);
+        store.commit('task/ADD_ASYNC_TASK', publishTask);
+        wrapper = makeWrapper({ store });
+      });
+
+      it('should display complete message', () => {
+        expect(getProgressModal(wrapper).text()).toContain(
+          'Once publishing is complete, you will receive an email notification and will be able to make further edits to your channel.'
+        );
+      });
+
+      it("shouldn't display progress bar", () => {
+        expect(getProgressBar(wrapper).exists()).toBe(false);
+      });
+
+      it("shouldn't display stop button", () => {
+        expect(getStopButton(wrapper).exists()).toBe(false);
+      });
+
+      it('should display refresh button', () => {
+        expect(getRefreshButton(wrapper).exists()).toBe(true);
+      });
+
+      it('clicking on refresh button should stop publishing and reload the page', async () => {
+        getRefreshButton(wrapper).trigger('click');
+
+        expect(stopTask).toHaveBeenCalledTimes(1);
+        await wrapper.vm.$nextTick();
+        expect(pageReload).toHaveBeenCalledTimes(1);
+      });
     });
-    expect(wrapper.find('[data-test="refresh"]').exists()).toBe(true);
   });
-  it('refresh button should reload the page', () => {
-    const cancelTaskAndClose = jest.fn();
-    let wrapper = makeWrapper({
-      progressPercent() {
-        return 100;
-      },
+
+  describe('when a user without publish permissions views a channel being published by another user', () => {
+    it('progress modal should not be displayed', () => {
+      const storeConfig = cloneDeep(STORE_CONFIG);
+      const store = storeFactory(storeConfig);
+      const wrapper = makeWrapper({ store });
+
+      jest
+        .spyOn(storeConfig.modules.currentChannel.getters, 'currentChannel')
+        .mockReturnValue({ publishing: true });
+      jest
+        .spyOn(storeConfig.modules.currentChannel.getters, 'canManage')
+        .mockReturnValue({ canManage: false });
+
+      expect(getProgressModal(wrapper).exists()).toBe(false);
+      expect(getCancelModal(wrapper).exists()).toBe(false);
     });
-    wrapper.setMethods({ cancelTaskAndClose });
-    wrapper.find('[data-test="refresh"]').trigger('click');
-    expect(cancelTaskAndClose).toHaveBeenCalled();
   });
 
-  describe('on cancel task', () => {
-    let wrapper;
+  describe('when syncing', () => {
+    let propsData, storeConfig, stopTask;
+
     beforeEach(() => {
-      wrapper = makeWrapper({
-        progressPercent() {
-          return 50;
-        },
-      });
+      propsData = {
+        syncing: true,
+      };
+      storeConfig = cloneDeep(STORE_CONFIG);
+      jest
+        .spyOn(storeConfig.modules.currentChannel.getters, 'currentChannel')
+        .mockReturnValue({ publishing: false });
+      stopTask = jest
+        .spyOn(storeConfig.modules.currentChannel.actions, 'stopTask')
+        .mockResolvedValue();
     });
-    it('stop task button should be shown if task is in progress', () => {
-      expect(wrapper.find('[data-test="stop"]').exists()).toBe(true);
+
+    it('progress modal should be displayed', () => {
+      const store = storeFactory(storeConfig);
+      const wrapper = makeWrapper({ propsData, store });
+
+      expect(getProgressModal(wrapper).exists()).toBe(true);
+      expect(getCancelModal(wrapper).exists()).toBe(false);
     });
-    it('clicking stop button should switch window to confirmation window', () => {
-      wrapper.find('[data-test="stop"]').trigger('click');
-      expect(wrapper.vm.step).toBe(2);
+
+    describe('is in progress', () => {
+      let wrapper;
+
+      beforeEach(() => {
+        const store = storeFactory(storeConfig);
+        wrapper = makeWrapper({ propsData, store });
+      });
+
+      it('should display syncing message', () => {
+        expect(getProgressModal(wrapper).text()).toContain(
+          'Channel syncing is in progress, please wait...'
+        );
+      });
+
+      it('should display progress bar', () => {
+        expect(getProgressBar(wrapper).exists()).toBe(true);
+      });
+
+      it("shouldn't display refresh button", () => {
+        expect(getRefreshButton(wrapper).exists()).toBe(false);
+      });
+
+      it('should display stop button', () => {
+        expect(getStopButton(wrapper).exists()).toBe(true);
+      });
+
+      it('clicking stop button should switch to cancel modal', () => {
+        getStopButton(wrapper).trigger('click');
+
+        expect(getCancelModal(wrapper).exists()).toBe(true);
+        expect(getProgressModal(wrapper).exists()).toBe(false);
+      });
+
+      it('cancelling the cancel modal should go back to progress modal', () => {
+        getStopButton(wrapper).trigger('click');
+        expect(getCancelModal(wrapper).exists()).toBe(true);
+
+        getCancelStopButton(wrapper).trigger('click');
+        expect(getCancelModal(wrapper).exists()).toBe(false);
+        expect(getProgressModal(wrapper).exists()).toBe(true);
+      });
+
+      it('confirmation of the cancel modal should stop syncing and reload the page', async () => {
+        // open the cancel modal
+        getStopButton(wrapper).trigger('click');
+        // confirm stop publishing
+        getCancelModal(wrapper)
+          .find('form')
+          .trigger('submit');
+
+        expect(stopTask).toHaveBeenCalledTimes(1);
+        await wrapper.vm.$nextTick();
+        expect(pageReload).toHaveBeenCalledTimes(1);
+      });
     });
-    it('clicking stop button on confirmation window should cancel the task', () => {
-      const cancelTaskAndClose = jest.fn();
-      wrapper.setMethods({ cancelTaskAndClose });
-      wrapper.setData({ step: 2 });
-      wrapper.find('[data-test="confirmstop"]').trigger('click');
-      expect(cancelTaskAndClose).toHaveBeenCalled();
+
+    describe('errored out', () => {
+      let wrapper;
+
+      beforeEach(() => {
+        const syncTask = cloneDeep(SYNC_TASK);
+        syncTask.status = 'FAILURE';
+        const store = storeFactory(storeConfig);
+        store.commit('task/ADD_ASYNC_TASK', syncTask);
+        wrapper = makeWrapper({ propsData, store });
+      });
+
+      it('should display an error message', () => {
+        expect(wrapper.text()).toContain('An unexpected error has occurred');
+      });
+
+      it('should display progress bar', () => {
+        expect(getProgressBar(wrapper).exists()).toBe(true);
+      });
+
+      it("shouldn't display stop button", () => {
+        expect(getStopButton(wrapper).exists()).toBe(false);
+      });
+
+      it('should display refresh button', () => {
+        expect(getRefreshButton(wrapper).exists()).toBe(true);
+      });
+
+      it('clicking on refresh button should stop syncing and reload the page', async () => {
+        getRefreshButton(wrapper).trigger('click');
+
+        expect(stopTask).toHaveBeenCalledTimes(1);
+        await wrapper.vm.$nextTick();
+        expect(pageReload).toHaveBeenCalledTimes(1);
+      });
     });
-    it('clicking cancel button on confirmation window should go back to progress window', () => {
-      const cancelTaskAndClose = jest.fn();
-      wrapper.setMethods({ cancelTaskAndClose });
-      wrapper.setData({ step: 2 });
-      wrapper.find('[data-test="cancelstop"]').trigger('click');
-      expect(wrapper.vm.step).toBe(1);
-      expect(cancelTaskAndClose).not.toHaveBeenCalled();
+
+    describe('is complete', () => {
+      let wrapper;
+
+      beforeEach(() => {
+        const syncTask = cloneDeep(SYNC_TASK);
+        syncTask.metadata.progress = 100;
+        const store = storeFactory(storeConfig);
+        store.commit('task/ADD_ASYNC_TASK', syncTask);
+        wrapper = makeWrapper({ propsData, store });
+      });
+
+      it('should display complete message', () => {
+        expect(getProgressModal(wrapper).text()).toContain(
+          'Operation complete! Click "Refresh" to update the page.'
+        );
+      });
+
+      it("shouldn't display progress bar", () => {
+        expect(getProgressBar(wrapper).exists()).toBe(false);
+      });
+
+      it("shouldn't display stop button", () => {
+        expect(getStopButton(wrapper).exists()).toBe(false);
+      });
+
+      it('should display refresh button', () => {
+        expect(getRefreshButton(wrapper).exists()).toBe(true);
+      });
+
+      it('clicking on refresh button should stop syncing and reload the page', async () => {
+        getRefreshButton(wrapper).trigger('click');
+
+        expect(stopTask).toHaveBeenCalledTimes(1);
+        await wrapper.vm.$nextTick();
+        expect(pageReload).toHaveBeenCalledTimes(1);
+      });
     });
   });
 });
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/sync/SyncResourcesModal.vue b/contentcuration/contentcuration/frontend/channelEdit/views/sync/SyncResourcesModal.vue
index 6115a0959b..055f8ccc34 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/sync/SyncResourcesModal.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/sync/SyncResourcesModal.vue
@@ -2,7 +2,15 @@
 
   <div>
     <!-- STEP 1 of 3: Sync dialog -->
-    <PrimaryDialog v-model="syncModal" :title="$tr('syncModalTitle')" lazy>
+    <KModal
+      v-if="syncModal"
+      :title="$tr('syncModalTitle')"
+      :submitDisabled="!continueAllowed"
+      :submitText="$tr('continueButtonLabel')"
+      :cancelText="$tr('cancelButtonLabel')"
+      @cancel="syncModal = false"
+      @submit="handleContinue"
+    >
       <VList subheader two-line>
         <VSubheader>{{ $tr('syncModalExplainer') }}</VSubheader>
 
@@ -47,19 +55,17 @@
         </VListTile>
       </VList>
       <VSpacer />
-      <template v-slot:actions>
-        <VSpacer />
-        <VBtn flat @click="syncModal = false">
-          {{ $tr('cancelButtonLabel') }}
-        </VBtn>
-        <VBtn color="primary" :disabled="!continueAllowed" @click="handleContinue">
-          {{ $tr('continueButtonLabel') }}
-        </VBtn>
-      </template>
-    </PrimaryDialog>
+    </KModal>
 
     <!-- STEP 2 of 3: Confirm sync dialog -->
-    <PrimaryDialog v-model="confirmSyncModal" :title="$tr('confirmSyncModalTitle')" lazy>
+    <KModal
+      v-if="confirmSyncModal"
+      :title="$tr('confirmSyncModalTitle')"
+      :submitText="$tr('syncButtonLabel')"
+      :cancelText="$tr('backButtonLabel')"
+      @cancel="handleBack"
+      @submit="handleSync"
+    >
       <VSubheader>{{ $tr('confirmSyncModalExplainer') }}</VSubheader>
       <VCardText>
         <ul class="mb-4 ml-3 mt-2">
@@ -78,16 +84,7 @@
         </ul>
       </VCardText>
       <VSpacer />
-      <template v-slot:actions>
-        <VSpacer />
-        <VBtn flat @click="handleBack">
-          {{ $tr('backButtonLabel') }}
-        </VBtn>
-        <VBtn color="primary" @click="handleSync">
-          {{ $tr('syncButtonLabel') }}
-        </VBtn>
-      </template>
-    </PrimaryDialog>
+    </KModal>
 
     <!-- STEP 3 of 3: Syncing progress dialog -->
     <!-- Handled by the asyncTasksModule, see channelEdit/vuex/task/index.js -->
@@ -99,12 +96,10 @@
 
   import { Channel } from 'shared/data/resources';
   import Checkbox from 'shared/views/form/Checkbox';
-  import PrimaryDialog from 'shared/views/PrimaryDialog';
 
   export default {
     name: 'SyncResourcesModal',
     components: {
-      PrimaryDialog,
       Checkbox,
     },
     props: {
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/trash/TrashModal.vue b/contentcuration/contentcuration/frontend/channelEdit/views/trash/TrashModal.vue
index 07bc233aef..8299f4bbd2 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/trash/TrashModal.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/trash/TrashModal.vue
@@ -127,7 +127,7 @@
 
   import { mapActions, mapGetters } from 'vuex';
   import sortBy from 'lodash/sortBy';
-  import { RouterNames } from '../../constants';
+  import { RouteNames } from '../../constants';
   import ResourceDrawer from '../../components/ResourceDrawer';
   import MoveModal from '../../components/move/MoveModal';
   import ContentNodeIcon from 'shared/views/ContentNodeIcon';
@@ -190,7 +190,7 @@
       },
       backLink() {
         return {
-          name: RouterNames.TREE_VIEW,
+          name: RouteNames.TREE_VIEW,
           params: this.$route.params,
         };
       },
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/trash/__tests__/trashModal.spec.js b/contentcuration/contentcuration/frontend/channelEdit/views/trash/__tests__/trashModal.spec.js
index 3f7451ab84..dd5c796b0e 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/trash/__tests__/trashModal.spec.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/trash/__tests__/trashModal.spec.js
@@ -2,7 +2,7 @@ import { mount } from '@vue/test-utils';
 import TrashModal from '../TrashModal';
 import { factory } from '../../../store';
 import router from '../../../router';
-import { RouterNames } from '../../../constants';
+import { RouteNames } from '../../../constants';
 
 const store = factory();
 
@@ -67,7 +67,7 @@ describe('trashModal', () => {
   let wrapper;
   beforeEach(() => {
     wrapper = makeWrapper();
-    router.replace({ name: RouterNames.TRASH, params: { nodeId: 'test' } });
+    router.replace({ name: RouteNames.TRASH, params: { nodeId: 'test' } });
     wrapper.setData({ loading: false });
   });
   describe('on load', () => {
diff --git a/contentcuration/contentcuration/frontend/channelList/constants.js b/contentcuration/contentcuration/frontend/channelList/constants.js
index f2d9d8bbb3..a4bb39e202 100644
--- a/contentcuration/contentcuration/frontend/channelList/constants.js
+++ b/contentcuration/contentcuration/frontend/channelList/constants.js
@@ -12,7 +12,7 @@ export const ChannelInvitationMapping = {
   [InvitationShareModes.VIEW_ONLY]: ChannelListTypes.VIEW_ONLY,
 };
 
-export const RouterNames = {
+export const RouteNames = {
   CHANNELS_EDITABLE: 'CHANNELS_EDITABLE',
   CHANNELS_STARRED: 'CHANNELS_STARRED',
   CHANNELS_VIEW_ONLY: 'CHANNELS_VIEW_ONLY',
@@ -27,10 +27,10 @@ export const RouterNames = {
 };
 
 export const ListTypeToRouteMapping = {
-  [ChannelListTypes.EDITABLE]: RouterNames.CHANNELS_EDITABLE,
-  [ChannelListTypes.STARRED]: RouterNames.CHANNELS_STARRED,
-  [ChannelListTypes.VIEW_ONLY]: RouterNames.CHANNELS_VIEW_ONLY,
-  [ChannelListTypes.PUBLIC]: RouterNames.CHANNELS_PUBLIC,
+  [ChannelListTypes.EDITABLE]: RouteNames.CHANNELS_EDITABLE,
+  [ChannelListTypes.STARRED]: RouteNames.CHANNELS_STARRED,
+  [ChannelListTypes.VIEW_ONLY]: RouteNames.CHANNELS_VIEW_ONLY,
+  [ChannelListTypes.PUBLIC]: RouteNames.CHANNELS_PUBLIC,
 };
 
 export const RouteToListTypeMapping = invert(ListTypeToRouteMapping);
diff --git a/contentcuration/contentcuration/frontend/channelList/router.js b/contentcuration/contentcuration/frontend/channelList/router.js
index 8b048296a2..d168c34ba4 100644
--- a/contentcuration/contentcuration/frontend/channelList/router.js
+++ b/contentcuration/contentcuration/frontend/channelList/router.js
@@ -3,7 +3,7 @@ import ChannelList from './views/Channel/ChannelList';
 import ChannelSetList from './views/ChannelSet/ChannelSetList';
 import ChannelSetModal from './views/ChannelSet/ChannelSetModal';
 import CatalogList from './views/Channel/CatalogList';
-import { RouterNames } from './constants';
+import { RouteNames } from './constants';
 import CatalogFAQ from './views/Channel/CatalogFAQ';
 import { ChannelListTypes } from 'shared/constants';
 import ChannelDetailsModal from 'shared/views/channel/ChannelDetailsModal';
@@ -12,66 +12,66 @@ import ChannelModal from 'shared/views/channel/ChannelModal';
 const router = new VueRouter({
   routes: [
     {
-      name: RouterNames.CHANNELS_EDITABLE,
+      name: RouteNames.CHANNELS_EDITABLE,
       path: '/my-channels',
       component: ChannelList,
       props: { listType: ChannelListTypes.EDITABLE },
     },
     {
-      name: RouterNames.CHANNELS_STARRED,
+      name: RouteNames.CHANNELS_STARRED,
       path: '/starred',
       component: ChannelList,
       props: { listType: ChannelListTypes.STARRED },
     },
     {
-      name: RouterNames.CHANNELS_VIEW_ONLY,
+      name: RouteNames.CHANNELS_VIEW_ONLY,
       path: '/view-only',
       component: ChannelList,
       props: { listType: ChannelListTypes.VIEW_ONLY },
     },
     {
-      name: RouterNames.CHANNEL_DETAILS,
+      name: RouteNames.CHANNEL_DETAILS,
       path: '/:channelId/details',
       component: ChannelDetailsModal,
       props: true,
     },
     {
-      name: RouterNames.CHANNEL_EDIT,
+      name: RouteNames.CHANNEL_EDIT,
       path: '/:channelId/:tab',
       component: ChannelModal,
       props: true,
     },
     {
-      name: RouterNames.CHANNEL_SETS,
+      name: RouteNames.CHANNEL_SETS,
       path: '/collections',
       component: ChannelSetList,
     },
     {
-      name: RouterNames.CHANNEL_SET_DETAILS,
+      name: RouteNames.CHANNEL_SET_DETAILS,
       path: '/collections/:channelSetId',
       component: ChannelSetModal,
       props: true,
     },
     {
-      name: RouterNames.CATALOG_ITEMS,
+      name: RouteNames.CATALOG_ITEMS,
       path: '/public',
       component: CatalogList,
     },
     {
-      name: RouterNames.CATALOG_DETAILS,
+      name: RouteNames.CATALOG_DETAILS,
       path: '/public/:channelId',
       component: ChannelDetailsModal,
       props: true,
     },
     {
-      name: RouterNames.CATALOG_FAQ,
+      name: RouteNames.CATALOG_FAQ,
       path: '/faq',
       component: CatalogFAQ,
     },
     // Catch-all for unrecognized URLs
     {
       path: '*',
-      redirect: { name: RouterNames.CHANNELS_EDITABLE },
+      redirect: { name: RouteNames.CHANNELS_EDITABLE },
     },
   ],
 });
diff --git a/contentcuration/contentcuration/frontend/channelList/views/Channel/CatalogFAQ.vue b/contentcuration/contentcuration/frontend/channelList/views/Channel/CatalogFAQ.vue
index 1e61561b42..9b427181bf 100644
--- a/contentcuration/contentcuration/frontend/channelList/views/Channel/CatalogFAQ.vue
+++ b/contentcuration/contentcuration/frontend/channelList/views/Channel/CatalogFAQ.vue
@@ -384,7 +384,7 @@
       customContentQuestion:
         'How can I add my own materials or recommend materials from other creators for this library?',
       customContentAnswer:
-        'We would love to get in touch with you regarding your own materials or your recommendations. Please contact us at content@learningequality.org!',
+        'To add your own materials, create an account on Kolibri Studio by going to https://studio.learningequality.org. Recommendations for public materials to be added to the Kolibri Content Library can be made by contacting content@learningequality.org.',
 
       // USING THESE RESOURCES
       usingResourcesHeader: 'About using these resources',
diff --git a/contentcuration/contentcuration/frontend/channelList/views/Channel/CatalogFilterBar.vue b/contentcuration/contentcuration/frontend/channelList/views/Channel/CatalogFilterBar.vue
index 21fc224c78..50dffa7f88 100644
--- a/contentcuration/contentcuration/frontend/channelList/views/Channel/CatalogFilterBar.vue
+++ b/contentcuration/contentcuration/frontend/channelList/views/Channel/CatalogFilterBar.vue
@@ -67,20 +67,18 @@
         </VFlex>
       </VLayout>
 
-      <PrimaryDialog
+      <KModal
         v-if="displayToken"
-        :value="Boolean(displayToken)"
         :title="$tr('copyTitle')"
         :text="$tr('copyTokenInstructions')"
+        :cancelText="$tr('close')"
+        @cancel="displayToken = null"
       >
+        <div class="mb-3">
+          {{ $tr('copyTokenInstructions') }}
+        </div>
         <CopyToken :token="displayToken" />
-        <template #actions>
-          <VSpacer />
-          <VBtn color="greyBackground" @click="displayToken = null">
-            {{ $tr('close') }}
-          </VBtn>
-        </template>
-      </PrimaryDialog>
+      </KModal>
 
     </div>
   </VContainer>
@@ -93,7 +91,6 @@
   import { catalogFilterMixin } from './mixins';
   import { constantsTranslationMixin } from 'shared/mixins';
   import IconButton from 'shared/views/IconButton';
-  import PrimaryDialog from 'shared/views/PrimaryDialog';
   import CopyToken from 'shared/views/CopyToken';
 
   const publicCollections = window.publicCollections || [];
@@ -113,7 +110,6 @@
     name: 'CatalogFilterBar',
     components: {
       IconButton,
-      PrimaryDialog,
       CopyToken,
     },
     mixins: [constantsTranslationMixin, catalogFilterMixin],
diff --git a/contentcuration/contentcuration/frontend/channelList/views/Channel/CatalogFilters.vue b/contentcuration/contentcuration/frontend/channelList/views/Channel/CatalogFilters.vue
index 575839e37d..0220ba5fe8 100644
--- a/contentcuration/contentcuration/frontend/channelList/views/Channel/CatalogFilters.vue
+++ b/contentcuration/contentcuration/frontend/channelList/views/Channel/CatalogFilters.vue
@@ -113,7 +113,7 @@
 
   import { mapGetters } from 'vuex';
   import debounce from 'lodash/debounce';
-  import { RouterNames } from '../../constants';
+  import { RouteNames } from '../../constants';
   import LanguageFilter from './components/LanguageFilter';
   import { catalogFilterMixin } from './mixins';
   import CatalogFilterBar from './CatalogFilterBar';
@@ -150,7 +150,7 @@
         return window.libraryMode;
       },
       faqLink() {
-        return { name: RouterNames.CATALOG_FAQ };
+        return { name: RouteNames.CATALOG_FAQ };
       },
       menuProps() {
         return { offsetY: true, maxHeight: 270 };
diff --git a/contentcuration/contentcuration/frontend/channelList/views/Channel/CatalogList.vue b/contentcuration/contentcuration/frontend/channelList/views/Channel/CatalogList.vue
index 0608a9cb18..79c72f65af 100644
--- a/contentcuration/contentcuration/frontend/channelList/views/Channel/CatalogList.vue
+++ b/contentcuration/contentcuration/frontend/channelList/views/Channel/CatalogList.vue
@@ -111,7 +111,7 @@
   import difference from 'lodash/difference';
   import isEqual from 'lodash/isEqual';
   import union from 'lodash/union';
-  import { RouterNames } from '../../constants';
+  import { RouteNames } from '../../constants';
   import ChannelItem from './ChannelItem';
   import CatalogFilters from './CatalogFilters';
   import LoadingText from 'shared/views/LoadingText';
@@ -186,7 +186,7 @@
         return debounce(this.loadCatalog, 1000);
       },
       detailsRouteName() {
-        return RouterNames.CATALOG_DETAILS;
+        return RouteNames.CATALOG_DETAILS;
       },
       channels() {
         return this.getChannels(this.page.results);
@@ -197,7 +197,7 @@
     },
     watch: {
       $route(to) {
-        if (!isEqual(to.query, this.previousQuery) && to.name === RouterNames.CATALOG_ITEMS) {
+        if (!isEqual(to.query, this.previousQuery) && to.name === RouteNames.CATALOG_ITEMS) {
           this.loading = true;
           this.debouncedSearch();
 
diff --git a/contentcuration/contentcuration/frontend/channelList/views/Channel/ChannelItem.vue b/contentcuration/contentcuration/frontend/channelList/views/Channel/ChannelItem.vue
index cf42aea580..818cd00585 100644
--- a/contentcuration/contentcuration/frontend/channelList/views/Channel/ChannelItem.vue
+++ b/contentcuration/contentcuration/frontend/channelList/views/Channel/ChannelItem.vue
@@ -1,218 +1,218 @@
 <template>
 
-  <VCard
-    class="channel my-3"
-    :class="{ hideHighlight, added }"
-    data-test="channel-card"
-    tabindex="0"
-    :href="linkToChannelTree ? channelHref : null"
-    :to="linkToChannelTree ? null : channelDetailsLink"
-    @click="goToChannelRoute"
-  >
-    <VLayout row wrap>
-      <VFlex :class="{ xs12: fullWidth, sm12: !fullWidth, sm3: fullWidth }" md3 class="pa-3">
-        <Thumbnail
-          :src="channel.thumbnail_url"
-          :encoding="channel.thumbnail_encoding"
-        />
-      </VFlex>
-      <VFlex :class="{ xs12: fullWidth, sm12: !fullWidth, sm9: fullWidth }" md9>
-        <VCardTitle>
-          <VFlex xs12>
-            <h3 class="card-header font-weight-bold notranslate" dir="auto">
-              {{ channel.name }}
-            </h3>
-          </VFlex>
-          <VFlex xs12>
-            <VLayout class="grey--text metadata-section">
-              <span class="metadata-field">
-                {{ $tr('resourceCount', { 'count': channel.count || 0 }) }}
-              </span>
-              <span class="metadata-field">
-                {{ language }}
+  <div>
+    <VCard
+      class="channel my-3"
+      :class="{ hideHighlight, added }"
+      data-test="channel-card"
+      tabindex="0"
+      :href="linkToChannelTree ? channelHref : null"
+      :to="linkToChannelTree ? null : channelDetailsLink"
+      @click="goToChannelRoute"
+    >
+      <VLayout row wrap>
+        <VFlex :class="{ xs12: fullWidth, sm12: !fullWidth, sm3: fullWidth }" md3 class="pa-3">
+          <Thumbnail
+            :src="channel.thumbnail_url"
+            :encoding="channel.thumbnail_encoding"
+          />
+        </VFlex>
+        <VFlex :class="{ xs12: fullWidth, sm12: !fullWidth, sm9: fullWidth }" md9>
+          <VCardTitle>
+            <VFlex xs12>
+              <h3 class="card-header font-weight-bold notranslate" dir="auto">
+                {{ channel.name }}
+              </h3>
+            </VFlex>
+            <VFlex xs12>
+              <VLayout class="grey--text metadata-section">
+                <span class="metadata-field">
+                  {{ $tr('resourceCount', { 'count': channel.count || 0 }) }}
+                </span>
+                <span class="metadata-field">
+                  {{ language }}
+                </span>
+              </VLayout>
+            </VFlex>
+            <VFlex xs12 class="notranslate">
+              <p dir="auto">
+                {{ channel.description }}
+              </p>
+            </VFlex>
+          </VCardTitle>
+        </VFlex>
+      </VLayout>
+      <VCardActions>
+        <VLayout align-center row wrap>
+          <VFlex shrink>
+            <!-- Some channels were published before the last_published field was added -->
+            <VCardText v-if="channel.published" class="grey--text py-0">
+              <span v-if="channel.last_published">
+                {{ $tr(
+                  'lastPublished',
+                  {
+                    'last_published': $formatRelative(
+                      channel.last_published,
+                      { now: new Date() }
+                    )
+                  })
+                }}
               </span>
-            </VLayout>
-          </VFlex>
-          <VFlex xs12 class="notranslate">
-            <p dir="auto">
-              {{ channel.description }}
-            </p>
+            </VCardText>
+            <VCardText v-else class="grey--text py-0">
+              {{ $tr('unpublishedText') }}
+            </VCardText>
           </VFlex>
-        </VCardTitle>
-      </VFlex>
-    </VLayout>
-    <VCardActions>
-      <VLayout align-center row wrap>
-        <VFlex shrink>
-          <!-- Some channels were published before the last_published field was added -->
-          <VCardText v-if="channel.published" class="grey--text py-0">
-            <span v-if="channel.last_published">
+          <VTooltip bottom>
+            <template #activator="{ on }">
+              <Icon
+                v-if="allowEdit && hasUnpublishedChanges"
+                color="greenSuccess"
+                :size="12"
+                v-on="on"
+              >
+                lens
+              </Icon>
+            </template>
+            <span>
               {{ $tr(
-                'lastPublished',
+                'lastUpdated',
                 {
-                  'last_published': $formatRelative(
-                    channel.last_published,
+                  'updated': $formatRelative(
+                    channel.modified,
                     { now: new Date() }
                   )
                 })
               }}
             </span>
-          </VCardText>
-          <VCardText v-else class="grey--text py-0">
-            {{ $tr('unpublishedText') }}
-          </VCardText>
-        </VFlex>
-        <VTooltip bottom>
-          <template #activator="{ on }">
-            <Icon
-              v-if="allowEdit && hasUnpublishedChanges"
-              color="greenSuccess"
-              :size="12"
-              v-on="on"
+          </VTooltip>
+          <VSpacer />
+          <VFlex shrink>
+            <router-link
+              v-if="!libraryMode"
+              :to="channelDetailsLink"
             >
-              lens
-            </Icon>
-          </template>
-          <span>
-            {{ $tr(
-              'lastUpdated',
-              {
-                'updated': $formatRelative(
-                  channel.modified,
-                  { now: new Date() }
-                )
-              })
-            }}
-          </span>
-        </VTooltip>
-        <VSpacer />
-        <VFlex shrink>
-          <router-link
-            v-if="!libraryMode"
-            :to="channelDetailsLink"
-          >
+
+              <IconButton
+                :color="$themeTokens.primary"
+                data-test="details-button"
+                class="mr-1"
+                icon="info"
+                :text="$tr('details')"
+                @mouseenter.native="hideHighlight = true"
+                @mouseleave.native="hideHighlight = false"
+              />
+
+            </router-link>
 
             <IconButton
-              :color="$themeTokens.primary"
-              data-test="details-button"
+              v-if="!allowEdit && channel.published"
               class="mr-1"
-              icon="info"
-              :text="$tr('details')"
+              icon="copy"
+              :text="$tr('copyToken')"
+              data-test="token-button"
+              @click.stop.prevent="tokenDialog = true"
               @mouseenter.native="hideHighlight = true"
               @mouseleave.native="hideHighlight = false"
             />
+            <ChannelStar
+              v-if="loggedIn"
+              :channelId="channelId"
+              :bookmark="channel.bookmark"
+              class="mr-1"
+              @mouseenter.native="hideHighlight = true"
+              @mouseleave.native="hideHighlight = false"
+            />
+            <Menu v-if="showOptions">
+              <template v-slot:activator="{ on }">
+                <VBtn
+                  icon
+                  flat
+                  data-test="menu"
+                  v-on="on"
+                  @click.stop.prevent
+                  @mouseenter="hideHighlight = true"
+                  @mouseleave="hideHighlight = false"
+                >
+                  <Icon>more_vert</Icon>
+                </VBtn>
+              </template>
+              <VList>
+                <VListTile
+                  v-if="canEdit"
+                  :to="channelEditLink"
+                  data-test="edit-channel"
+                  @click.stop
+                >
+                  <VListTileAction>
+                    <Icon>edit</Icon>
+                  </VListTileAction>
+                  <VListTileTitle>{{ $tr('editChannel') }}</VListTileTitle>
+                </VListTile>
+                <VListTile
+                  v-if="allowEdit && channel.published"
+                  data-test="token-listitem"
+                  @click="tokenDialog = true"
+                >
+                  <VListTileAction>
+                    <Icon>content_copy</Icon>
+                  </VListTileAction>
+                  <VListTileTitle>{{ $tr('copyToken') }}</VListTileTitle>
+                </VListTile>
+                <VListTile
+                  v-if="channel.source_url"
+                  :href="channel.source_url"
+                  target="_blank"
+                  @click.stop
+                >
+                  <VListTileAction>
+                    <Icon class="rtl-flip">
+                      launch
+                    </Icon>
+                  </VListTileAction>
+                  <VListTileTitle>{{ $tr('goToWebsite') }}</VListTileTitle>
+                </VListTile>
+                <VListTile
+                  v-if="channel.demo_server_url"
+                  :href="channel.demo_server_url"
+                  target="_blank"
+                >
+                  <VListTileAction>
+                    <Icon class="rtl-flip">
+                      launch
+                    </Icon>
+                  </VListTileAction>
+                  <VListTileTitle>{{ $tr('viewContent') }}</VListTileTitle>
+                </VListTile>
+                <VListTile
+                  v-if="allowEdit"
+                  data-test="delete-channel"
+                  @click.stop="deleteDialog = true"
+                >
+                  <VListTileAction>
+                    <Icon>delete</Icon>
+                  </VListTileAction>
+                  <VListTileTitle>{{ $tr('deleteChannel') }}</VListTileTitle>
+                </VListTile>
+              </VList>
+            </Menu>
+          </VFlex>
+        </VLayout>
+      </VCardActions>
 
-          </router-link>
-
-          <IconButton
-            v-if="!allowEdit && channel.published"
-            class="mr-1"
-            icon="copy"
-            :text="$tr('copyToken')"
-            data-test="token-button"
-            @click.stop.prevent="tokenDialog = true"
-            @mouseenter.native="hideHighlight = true"
-            @mouseleave.native="hideHighlight = false"
-          />
-          <ChannelStar
-            v-if="loggedIn"
-            :channelId="channelId"
-            :bookmark="channel.bookmark"
-            class="mr-1"
-            @mouseenter.native="hideHighlight = true"
-            @mouseleave.native="hideHighlight = false"
-          />
-          <Menu v-if="showOptions">
-            <template v-slot:activator="{ on }">
-              <VBtn
-                icon
-                flat
-                data-test="menu"
-                v-on="on"
-                @click.stop.prevent
-                @mouseenter="hideHighlight = true"
-                @mouseleave="hideHighlight = false"
-              >
-                <Icon>more_vert</Icon>
-              </VBtn>
-            </template>
-            <VList>
-              <VListTile
-                v-if="canEdit"
-                :to="channelEditLink"
-                data-test="edit-channel"
-                @click.stop
-              >
-                <VListTileAction>
-                  <Icon>edit</Icon>
-                </VListTileAction>
-                <VListTileTitle>{{ $tr('editChannel') }}</VListTileTitle>
-              </VListTile>
-              <VListTile
-                v-if="allowEdit && channel.published"
-                data-test="token-listitem"
-                @click="tokenDialog = true"
-              >
-                <VListTileAction>
-                  <Icon>content_copy</Icon>
-                </VListTileAction>
-                <VListTileTitle>{{ $tr('copyToken') }}</VListTileTitle>
-              </VListTile>
-              <VListTile
-                v-if="channel.source_url"
-                :href="channel.source_url"
-                target="_blank"
-                @click.stop
-              >
-                <VListTileAction>
-                  <Icon class="rtl-flip">
-                    launch
-                  </Icon>
-                </VListTileAction>
-                <VListTileTitle>{{ $tr('goToWebsite') }}</VListTileTitle>
-              </VListTile>
-              <VListTile
-                v-if="channel.demo_server_url"
-                :href="channel.demo_server_url"
-                target="_blank"
-              >
-                <VListTileAction>
-                  <Icon class="rtl-flip">
-                    launch
-                  </Icon>
-                </VListTileAction>
-                <VListTileTitle>{{ $tr('viewContent') }}</VListTileTitle>
-              </VListTile>
-              <VListTile
-                v-if="allowEdit"
-                data-test="delete-channel"
-                @click.stop="deleteDialog = true"
-              >
-                <VListTileAction>
-                  <Icon>delete</Icon>
-                </VListTileAction>
-                <VListTileTitle>{{ $tr('deleteChannel') }}</VListTileTitle>
-              </VListTile>
-            </VList>
-          </Menu>
-        </VFlex>
-      </VLayout>
-    </VCardActions>
-
+    </VCard>
     <!-- Delete dialog -->
-    <PrimaryDialog v-model="deleteDialog" :title="$tr('deleteTitle')">
+    <KModal
+      v-if="deleteDialog"
+      :title="$tr('deleteTitle')"
+      :submitText="$tr('deleteChannel')"
+      :cancelText="$tr('cancel')"
+      data-test="delete-modal"
+      @submit="handleDelete"
+      @cancel="deleteDialog = false"
+    >
       {{ $tr('deletePrompt') }}
-      <template v-slot:actions>
-        <VSpacer />
-        <VBtn color="primary" flat @click="deleteDialog = false">
-          {{ $tr('cancel') }}
-        </VBtn>
-        <VBtn color="primary" data-test="delete" @click="handleDelete">
-          {{ $tr('deleteChannel') }}
-        </VBtn>
-      </template>
-    </PrimaryDialog>
-
+    </KModal>
     <!-- Copy dialog -->
     <ChannelTokenModal
       v-if="channel && channel.published"
@@ -220,16 +220,15 @@
       :channel="channel"
       @copied="trackTokenCopy"
     />
-  </VCard>
+  </div>
 
 </template>
 
 <script>
 
   import { mapActions, mapGetters, mapMutations } from 'vuex';
-  import { RouterNames } from '../../constants';
+  import { RouteNames } from '../../constants';
   import ChannelStar from './ChannelStar';
-  import PrimaryDialog from 'shared/views/PrimaryDialog';
   import ChannelTokenModal from 'shared/views/channel/ChannelTokenModal';
   import Thumbnail from 'shared/views/files/Thumbnail';
   import Languages from 'shared/leUtils/Languages';
@@ -239,7 +238,6 @@
     name: 'ChannelItem',
     components: {
       ChannelStar,
-      PrimaryDialog,
       ChannelTokenModal,
       Thumbnail,
       IconButton,
@@ -251,7 +249,7 @@
       },
       detailsRouteName: {
         type: String,
-        default: RouterNames.CHANNEL_DETAILS,
+        default: RouteNames.CHANNEL_DETAILS,
       },
       allowEdit: {
         type: Boolean,
@@ -285,7 +283,7 @@
       },
       channelEditLink() {
         return {
-          name: RouterNames.CHANNEL_EDIT,
+          name: RouteNames.CHANNEL_EDIT,
           query: {
             // this component is used on the catalog search
             // page => do not lose search query
diff --git a/contentcuration/contentcuration/frontend/channelList/views/Channel/ChannelList.vue b/contentcuration/contentcuration/frontend/channelList/views/Channel/ChannelList.vue
index abfd3f9004..1ee4d94ae3 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 sortBy from 'lodash/sortBy';
-  import { RouterNames, CHANNEL_PAGE_SIZE } from '../../constants';
+  import { RouteNames, CHANNEL_PAGE_SIZE } from '../../constants';
   import ChannelItem from './ChannelItem';
   import LoadingText from 'shared/views/LoadingText';
   import { ChannelListTypes } from 'shared/constants';
@@ -118,7 +118,7 @@
         this.$analytics.trackClick('channel_list', 'Create channel');
         this.createChannel().then(id => {
           this.$router.push({
-            name: RouterNames.CHANNEL_EDIT,
+            name: RouteNames.CHANNEL_EDIT,
             params: { channelId: id, tab: 'edit' },
             query: { last: this.$route.name },
           });
diff --git a/contentcuration/contentcuration/frontend/channelList/views/Channel/__tests__/catalogList.spec.js b/contentcuration/contentcuration/frontend/channelList/views/Channel/__tests__/catalogList.spec.js
index d447d3e99b..387a4b6daa 100644
--- a/contentcuration/contentcuration/frontend/channelList/views/Channel/__tests__/catalogList.spec.js
+++ b/contentcuration/contentcuration/frontend/channelList/views/Channel/__tests__/catalogList.spec.js
@@ -1,12 +1,12 @@
 import { mount } from '@vue/test-utils';
 import { factory } from '../../../store';
 import router from '../../../router';
-import { RouterNames } from '../../../constants';
+import { RouteNames } from '../../../constants';
 import CatalogList from '../CatalogList';
 
 const store = factory();
 
-router.push({ name: RouterNames.CATALOG_ITEMS });
+router.push({ name: RouteNames.CATALOG_ITEMS });
 
 const results = ['channel-1', 'channel-2'];
 
diff --git a/contentcuration/contentcuration/frontend/channelList/views/Channel/__tests__/channelItem.spec.js b/contentcuration/contentcuration/frontend/channelList/views/Channel/__tests__/channelItem.spec.js
index 1a3652a0be..407979afea 100644
--- a/contentcuration/contentcuration/frontend/channelList/views/Channel/__tests__/channelItem.spec.js
+++ b/contentcuration/contentcuration/frontend/channelList/views/Channel/__tests__/channelItem.spec.js
@@ -3,7 +3,7 @@ import { mount } from '@vue/test-utils';
 import VueRouter from 'vue-router';
 import { factory } from '../../../store';
 import router from '../../../router';
-import { RouterNames } from '../../../constants';
+import { RouteNames } from '../../../constants';
 import ChannelItem from '../ChannelItem.vue';
 
 const store = factory();
@@ -62,15 +62,15 @@ describe('channelItem', () => {
   });
   it('clicking the channel should open the channel', () => {
     wrapper.find('[data-test="channel-card"]').trigger('click');
-    expect(wrapper.vm.$route.name).toEqual(RouterNames.CHANNELS_EDITABLE);
+    expect(wrapper.vm.$route.name).toEqual(RouteNames.CHANNELS_EDITABLE);
   });
   it('clicking edit channel should open a channel editor modal', () => {
     wrapper.find('[data-test="edit-channel"]').trigger('click');
-    expect(wrapper.vm.$route.name).toEqual(RouterNames.CHANNEL_EDIT);
+    expect(wrapper.vm.$route.name).toEqual(RouteNames.CHANNEL_EDIT);
   });
   it('clicking the info icon should open a channel details modal ', () => {
     wrapper.find('[data-test="details-button"]').trigger('click');
-    expect(wrapper.vm.$route.name).toEqual(RouterNames.CHANNEL_DETAILS);
+    expect(wrapper.vm.$route.name).toEqual(RouteNames.CHANNEL_DETAILS);
   });
   it('clicking the token option should open the token modal', () => {
     wrapper.find('[data-test="token-listitem"]').trigger('click');
@@ -78,7 +78,7 @@ describe('channelItem', () => {
   });
   it('clicking delete button in dialog should delete the channel', () => {
     wrapper.setData({ deleteDialog: true });
-    wrapper.find('[data-test="delete"]').trigger('click');
+    wrapper.find('[data-test="delete-modal"]').trigger('submit');
     wrapper.vm.$nextTick(() => {
       expect(deleteStub).toHaveBeenCalled();
     });
@@ -90,7 +90,7 @@ describe('channelItem', () => {
     });
     it('clicking channel card should open details modal', () => {
       wrapper.find('[data-test="channel-card"]').trigger('click');
-      expect(wrapper.vm.$route.name).toEqual(RouterNames.CHANNEL_DETAILS);
+      expect(wrapper.vm.$route.name).toEqual(RouteNames.CHANNEL_DETAILS);
     });
     it('clicking the token button should open the token modal', () => {
       wrapper.setData({ tokenDialog: false });
diff --git a/contentcuration/contentcuration/frontend/channelList/views/ChannelListAppError.vue b/contentcuration/contentcuration/frontend/channelList/views/ChannelListAppError.vue
index ea126c55ac..82cdb78d56 100644
--- a/contentcuration/contentcuration/frontend/channelList/views/ChannelListAppError.vue
+++ b/contentcuration/contentcuration/frontend/channelList/views/ChannelListAppError.vue
@@ -26,7 +26,7 @@
 
 <script>
 
-  import { RouterNames } from '../constants';
+  import { RouteNames } from '../constants';
   import ChannelNotFoundError from 'shared/views/errors/ChannelNotFoundError';
   import PageNotFoundError from 'shared/views/errors/PageNotFoundError';
   import PermissionsError from 'shared/views/errors/PermissionsError';
@@ -56,7 +56,7 @@
       homeUrl() {
         return {
           to: {
-            name: RouterNames.CHANNELS_EDITABLE,
+            name: RouteNames.CHANNELS_EDITABLE,
           },
         };
       },
diff --git a/contentcuration/contentcuration/frontend/channelList/views/ChannelListIndex.vue b/contentcuration/contentcuration/frontend/channelList/views/ChannelListIndex.vue
index 8979d5b9ea..082acef4be 100644
--- a/contentcuration/contentcuration/frontend/channelList/views/ChannelListIndex.vue
+++ b/contentcuration/contentcuration/frontend/channelList/views/ChannelListIndex.vue
@@ -86,7 +86,7 @@
 
   import { mapActions, mapGetters, mapState } from 'vuex';
   import {
-    RouterNames,
+    RouteNames,
     ChannelInvitationMapping,
     ListTypeToRouteMapping,
     RouteToListTypeMapping,
@@ -102,9 +102,9 @@
   import PolicyModals from 'shared/views/policies/PolicyModals';
 
   const CATALOG_PAGES = [
-    RouterNames.CATALOG_ITEMS,
-    RouterNames.CATALOG_DETAILS,
-    RouterNames.CATALOG_FAQ,
+    RouteNames.CATALOG_ITEMS,
+    RouteNames.CATALOG_DETAILS,
+    RouteNames.CATALOG_FAQ,
   ];
 
   const CHANNEL_SETS = 'channel_sets';
@@ -141,10 +141,10 @@
         return window.libraryMode;
       },
       isFAQPage() {
-        return this.$route.name === RouterNames.CATALOG_FAQ;
+        return this.$route.name === RouteNames.CATALOG_FAQ;
       },
       isCatalogPage() {
-        return this.$route.name === RouterNames.CATALOG_ITEMS;
+        return this.$route.name === RouteNames.CATALOG_ITEMS;
       },
       currentListType() {
         return RouteToListTypeMapping[this.$route.name];
@@ -176,10 +176,10 @@
         return inviteMap;
       },
       channelSetLink() {
-        return { name: RouterNames.CHANNEL_SETS };
+        return { name: RouteNames.CHANNEL_SETS };
       },
       catalogLink() {
-        return { name: RouterNames.CATALOG_ITEMS };
+        return { name: RouteNames.CATALOG_ITEMS };
       },
       isChannelList() {
         return this.lists.includes(this.currentListType);
@@ -196,7 +196,7 @@
     },
     watch: {
       $route(route) {
-        if (this.loggedIn && route.name === RouterNames.CHANNELS_EDITABLE) {
+        if (this.loggedIn && route.name === RouteNames.CHANNELS_EDITABLE) {
           this.loadInvitationList();
         }
         if (this.fullPageError) {
@@ -213,7 +213,7 @@
         this.loadInvitationList();
       } else if (!CATALOG_PAGES.includes(this.$route.name)) {
         this.$router.push({
-          name: RouterNames.CATALOG_ITEMS,
+          name: RouteNames.CATALOG_ITEMS,
         });
       }
     },
@@ -232,15 +232,15 @@
         // Updates the tab title every time the top-level route changes
         let title;
         const routeName = this.$route.name;
-        if (routeName === RouterNames.CHANNEL_SETS) {
+        if (routeName === RouteNames.CHANNEL_SETS) {
           title = this.$tr('channelSets');
-        } else if (routeName === RouterNames.CATALOG_ITEMS) {
+        } else if (routeName === RouteNames.CATALOG_ITEMS) {
           title = this.translateConstant('public');
-        } else if (routeName === RouterNames.CHANNELS_VIEW_ONLY) {
+        } else if (routeName === RouteNames.CHANNELS_VIEW_ONLY) {
           title = this.translateConstant('view');
-        } else if (routeName === RouterNames.CHANNELS_STARRED) {
+        } else if (routeName === RouteNames.CHANNELS_STARRED) {
           title = this.translateConstant('bookmark');
-        } else if (routeName === RouterNames.CHANNELS_EDITABLE) {
+        } else if (routeName === RouteNames.CHANNELS_EDITABLE) {
           title = this.translateConstant('edit');
         }
         // Title changes for other routes are handled by other components, since
diff --git a/contentcuration/contentcuration/frontend/channelList/views/ChannelSet/ChannelSetItem.vue b/contentcuration/contentcuration/frontend/channelList/views/ChannelSet/ChannelSetItem.vue
index afc461bb31..9ba6ed3895 100644
--- a/contentcuration/contentcuration/frontend/channelList/views/ChannelSet/ChannelSetItem.vue
+++ b/contentcuration/contentcuration/frontend/channelList/views/ChannelSet/ChannelSetItem.vue
@@ -62,7 +62,7 @@
 <script>
 
   import { mapActions, mapGetters } from 'vuex';
-  import { RouterNames } from '../../constants';
+  import { RouteNames } from '../../constants';
   import MessageDialog from 'shared/views/MessageDialog';
   import CopyToken from 'shared/views/CopyToken';
 
@@ -90,7 +90,7 @@
       },
       channelSetDetailsLink() {
         return {
-          name: RouterNames.CHANNEL_SET_DETAILS,
+          name: RouteNames.CHANNEL_SET_DETAILS,
           params: { channelSetId: this.channelSet.id },
         };
       },
diff --git a/contentcuration/contentcuration/frontend/channelList/views/ChannelSet/ChannelSetList.vue b/contentcuration/contentcuration/frontend/channelList/views/ChannelSet/ChannelSetList.vue
index 8e6c26a840..ea771b5241 100644
--- a/contentcuration/contentcuration/frontend/channelList/views/ChannelSet/ChannelSetList.vue
+++ b/contentcuration/contentcuration/frontend/channelList/views/ChannelSet/ChannelSetList.vue
@@ -69,7 +69,7 @@
 
   import sortBy from 'lodash/sortBy';
   import { mapGetters, mapActions } from 'vuex';
-  import { RouterNames } from '../../constants';
+  import { RouteNames } from '../../constants';
   import ChannelSetItem from './ChannelSetItem.vue';
   import MessageDialog from 'shared/views/MessageDialog';
   import LoadingText from 'shared/views/LoadingText';
@@ -111,7 +111,7 @@
       newChannelSet() {
         this.createChannelSet().then(id => {
           this.$router.push({
-            name: RouterNames.CHANNEL_SET_DETAILS,
+            name: RouteNames.CHANNEL_SET_DETAILS,
             params: { channelSetId: id },
           });
         });
diff --git a/contentcuration/contentcuration/frontend/channelList/views/ChannelSet/ChannelSetModal.vue b/contentcuration/contentcuration/frontend/channelList/views/ChannelSet/ChannelSetModal.vue
index 2877196fda..fc8e7e3d69 100644
--- a/contentcuration/contentcuration/frontend/channelList/views/ChannelSet/ChannelSetModal.vue
+++ b/contentcuration/contentcuration/frontend/channelList/views/ChannelSet/ChannelSetModal.vue
@@ -154,7 +154,7 @@
   import Vue from 'vue';
   import { mapGetters, mapActions } from 'vuex';
   import difference from 'lodash/difference';
-  import { RouterNames } from '../../constants';
+  import { RouteNames } from '../../constants';
   import ChannelSelectionList from './ChannelSelectionList';
   import ChannelItem from './ChannelItem';
   import { NEW_OBJECT, ChannelListTypes, ErrorTypes } from 'shared/constants';
@@ -346,7 +346,7 @@
         this.changed = false;
         this.showUnsavedDialog = false;
         this.diffTracker = {};
-        this.$router.push({ name: RouterNames.CHANNEL_SETS });
+        this.$router.push({ name: RouteNames.CHANNEL_SETS });
       },
       verifyChannelSet(channelSetId) {
         return new Promise((resolve, reject) => {
diff --git a/contentcuration/contentcuration/frontend/channelList/views/ChannelSet/__tests__/channelSetItem.spec.js b/contentcuration/contentcuration/frontend/channelList/views/ChannelSet/__tests__/channelSetItem.spec.js
index 25ff44a708..740aa56c5e 100644
--- a/contentcuration/contentcuration/frontend/channelList/views/ChannelSet/__tests__/channelSetItem.spec.js
+++ b/contentcuration/contentcuration/frontend/channelList/views/ChannelSet/__tests__/channelSetItem.spec.js
@@ -1,7 +1,7 @@
 import { mount } from '@vue/test-utils';
 import { factory } from '../../../store';
 import router from '../../../router';
-import { RouterNames } from '../../../constants';
+import { RouteNames } from '../../../constants';
 import ChannelSetItem from '../ChannelSetItem.vue';
 
 const store = factory();
@@ -36,7 +36,7 @@ describe('channelSetItem', () => {
   });
   it('clicking the edit option should open the channel set edit modal', () => {
     wrapper.find('[data-test="edit"]').trigger('click');
-    expect(wrapper.vm.$route.name).toEqual(RouterNames.CHANNEL_SET_DETAILS);
+    expect(wrapper.vm.$route.name).toEqual(RouteNames.CHANNEL_SET_DETAILS);
   });
   it('clicking delete button in dialog should delete the channel set', () => {
     wrapper.vm.deleteDialog = true;
diff --git a/contentcuration/contentcuration/frontend/channelList/views/ChannelSet/__tests__/channelSetList.spec.js b/contentcuration/contentcuration/frontend/channelList/views/ChannelSet/__tests__/channelSetList.spec.js
index 62daa7b143..c8824a7fdf 100644
--- a/contentcuration/contentcuration/frontend/channelList/views/ChannelSet/__tests__/channelSetList.spec.js
+++ b/contentcuration/contentcuration/frontend/channelList/views/ChannelSet/__tests__/channelSetList.spec.js
@@ -1,7 +1,7 @@
 import { mount } from '@vue/test-utils';
 import { factory } from '../../../store';
 import router from '../../../router';
-import { RouterNames } from '../../../constants';
+import { RouteNames } from '../../../constants';
 import ChannelSetList from '../ChannelSetList.vue';
 
 const store = factory();
@@ -10,7 +10,7 @@ const id = '00000000000000000000000000000000';
 
 function makeWrapper(createChannelSetStub) {
   router.push({
-    name: RouterNames.CHANNEL_SETS,
+    name: RouteNames.CHANNEL_SETS,
   });
   const wrapper = mount(ChannelSetList, { store, router });
   wrapper.setMethods({
diff --git a/contentcuration/contentcuration/frontend/channelList/views/ChannelSet/__tests__/channelSetModal.spec.js b/contentcuration/contentcuration/frontend/channelList/views/ChannelSet/__tests__/channelSetModal.spec.js
index bc33b38761..0a1d1efb2c 100644
--- a/contentcuration/contentcuration/frontend/channelList/views/ChannelSet/__tests__/channelSetModal.spec.js
+++ b/contentcuration/contentcuration/frontend/channelList/views/ChannelSet/__tests__/channelSetModal.spec.js
@@ -4,7 +4,7 @@ import VueRouter from 'vue-router';
 import { cloneDeep } from 'lodash';
 import flushPromises from 'flush-promises';
 
-import { RouterNames } from '../../../constants';
+import { RouteNames } from '../../../constants';
 import router from '../../../router';
 import channelSet from '../../../vuex/channelSet';
 import ChannelSetModal from '../ChannelSetModal';
@@ -46,9 +46,9 @@ const NEW_CHANNEL_SET = {
 };
 
 const makeWrapper = ({ store, channelSetId }) => {
-  if (router.currentRoute.name !== RouterNames.CHANNEL_SET_DETAILS) {
+  if (router.currentRoute.name !== RouteNames.CHANNEL_SET_DETAILS) {
     router.push({
-      name: RouterNames.CHANNEL_SET_DETAILS,
+      name: RouteNames.CHANNEL_SET_DETAILS,
       params: {
         channelSetId,
       },
@@ -232,7 +232,7 @@ describe('ChannelSetModal', () => {
       it('should redirect to channel sets page', () => {
         getCloseButton(wrapper).trigger('click');
 
-        expect(wrapper.vm.$route.name).toBe(RouterNames.CHANNEL_SETS);
+        expect(wrapper.vm.$route.name).toBe(RouteNames.CHANNEL_SETS);
       });
 
       it('should delete a channel set if it is new', () => {
diff --git a/contentcuration/contentcuration/frontend/settings/constants.js b/contentcuration/contentcuration/frontend/settings/constants.js
index c2d86556e9..c32d478314 100644
--- a/contentcuration/contentcuration/frontend/settings/constants.js
+++ b/contentcuration/contentcuration/frontend/settings/constants.js
@@ -1,4 +1,4 @@
-export const RouterNames = {
+export const RouteNames = {
   ACCOUNT: 'ACCOUNT',
   STORAGE: 'STORAGE',
   USING_STUDIO: 'USING_STUDIO',
diff --git a/contentcuration/contentcuration/frontend/settings/pages/SettingsIndex.vue b/contentcuration/contentcuration/frontend/settings/pages/SettingsIndex.vue
index 523531e6d6..43417b5dcf 100644
--- a/contentcuration/contentcuration/frontend/settings/pages/SettingsIndex.vue
+++ b/contentcuration/contentcuration/frontend/settings/pages/SettingsIndex.vue
@@ -6,13 +6,13 @@
       :style="{ color: $themeTokens.textInverted }"
     >
       <template #tabs>
-        <VTab :to="{ name: RouterNames.ACCOUNT }">
+        <VTab :to="{ name: RouteNames.ACCOUNT }">
           {{ $tr('accountLabel') }}
         </VTab>
-        <VTab :to="{ name: RouterNames.STORAGE }">
+        <VTab :to="{ name: RouteNames.STORAGE }">
           {{ $tr('storageLabel') }}
         </VTab>
-        <VTab :to="{ name: RouterNames.USING_STUDIO }">
+        <VTab :to="{ name: RouteNames.USING_STUDIO }">
           {{ $tr('usingStudioLabel') }}
         </VTab>
       </template>
@@ -39,7 +39,7 @@
 <script>
 
   import { mapActions, mapState } from 'vuex';
-  import { RouterNames } from '../constants';
+  import { RouteNames } from '../constants';
   import GlobalSnackbar from 'shared/views/GlobalSnackbar';
   import AppBar from 'shared/views/AppBar';
   import { routerMixin } from 'shared/mixins';
@@ -54,8 +54,8 @@
       ...mapState({
         offline: state => !state.connection.online,
       }),
-      RouterNames() {
-        return RouterNames;
+      RouteNames() {
+        return RouteNames;
       },
     },
     watch: {
@@ -73,11 +73,11 @@
         // Updates the tab title every time the top-level route changes
         let title;
         const routeName = this.$route.name;
-        if (routeName === RouterNames.ACCOUNT) {
+        if (routeName === RouteNames.ACCOUNT) {
           title = this.$tr('accountLabel');
-        } else if (routeName === RouterNames.STORAGE) {
+        } else if (routeName === RouteNames.STORAGE) {
           title = this.$tr('storageLabel');
-        } else if (routeName === RouterNames.USING_STUDIO) {
+        } else if (routeName === RouteNames.USING_STUDIO) {
           title = this.$tr('usingStudioLabel');
         }
         // TODO combine this `{firstItem} - {secondItem}` into a single message to support
diff --git a/contentcuration/contentcuration/frontend/settings/router.js b/contentcuration/contentcuration/frontend/settings/router.js
index e2529f9e7a..f3fe5ea016 100644
--- a/contentcuration/contentcuration/frontend/settings/router.js
+++ b/contentcuration/contentcuration/frontend/settings/router.js
@@ -1,5 +1,5 @@
 import VueRouter from 'vue-router';
-import { RouterNames } from './constants';
+import { RouteNames } from './constants';
 import Account from './pages/Account/index';
 import Storage from './pages/Storage/index';
 import UsingStudio from './pages/UsingStudio';
@@ -7,19 +7,19 @@ import UsingStudio from './pages/UsingStudio';
 const router = new VueRouter({
   routes: [
     {
-      name: RouterNames.ACCOUNT,
+      name: RouteNames.ACCOUNT,
       path: '/account',
       props: true,
       component: Account,
     },
     {
-      name: RouterNames.STORAGE,
+      name: RouteNames.STORAGE,
       path: '/storage',
       props: true,
       component: Storage,
     },
     {
-      name: RouterNames.USING_STUDIO,
+      name: RouteNames.USING_STUDIO,
       path: '/using-studio',
       props: true,
       component: UsingStudio,
@@ -27,7 +27,7 @@ const router = new VueRouter({
     // Unrecognized paths go to default Account path
     {
       path: '*',
-      redirect: { name: RouterNames.ACCOUNT },
+      redirect: { name: RouteNames.ACCOUNT },
     },
   ],
 });
diff --git a/contentcuration/contentcuration/frontend/shared/languageSwitcher/LanguageSwitcherList.vue b/contentcuration/contentcuration/frontend/shared/languageSwitcher/LanguageSwitcherList.vue
index fe405e9651..30cc36563b 100644
--- a/contentcuration/contentcuration/frontend/shared/languageSwitcher/LanguageSwitcherList.vue
+++ b/contentcuration/contentcuration/frontend/shared/languageSwitcher/LanguageSwitcherList.vue
@@ -9,7 +9,11 @@
         class="globe"
         @click="showLanguageModal = true"
       />
-      <span class="selected" :title="selectedLanguage.english_name">
+      <span
+        class="dotsSpan selected"
+        :style="{ 'margin': '0' }"
+        :title="selectedLanguage.english_name"
+      >
         {{ selectedLanguage.lang_name }}
       </span>
       <KButton
@@ -18,10 +22,11 @@
         :text="language.lang_name"
         :title="language.english_name"
         class="lang"
+        :class="determineLangDirection(language.lang_direction)"
         appearance="basic-link"
+        :style="{ 'margin': '0 2px' }"
         @click="switchLanguage(language.id)"
       />
-
       <KButton
         v-if="numSelectableLanguages > numVisibleLanguages + 1"
         :text="$tr('showMoreLanguagesSelector')"
@@ -96,6 +101,11 @@
           .slice(0, this.numVisibleLanguages);
       },
     },
+    methods: {
+      determineLangDirection(direction) {
+        return (!this.$isRTL && direction) || (this.$isRTL && !direction) ? 'dotsRtl' : 'dots';
+      },
+    },
     $trs: {
       showMoreLanguagesSelector: 'More languages',
     },
@@ -125,4 +135,35 @@
     text-align: left;
   }
 
+  .dots:not(:last-child)::after {
+    // because it is a pseudo-element, text-decoration none only works with 'display: inline-block`
+    display: inline-block;
+    margin: 0 8px;
+    font-size: 14pt;
+    color: var(--v-grey-base);
+    text-decoration: none;
+    vertical-align: middle;
+    content: '•';
+  }
+
+  .dotsSpan::after {
+    display: inline-block;
+    margin: 0 6px;
+    font-size: 14pt;
+    color: var(--v-grey-base);
+    text-decoration: none;
+    vertical-align: middle;
+    content: '•';
+  }
+
+  .dotsRtl:not(:last-child)::before {
+    display: inline-block;
+    margin: 0 8px;
+    font-size: 14pt;
+    color: var(--v-grey-base);
+    text-decoration: none;
+    vertical-align: middle;
+    content: '•';
+  }
+
 </style>
diff --git a/contentcuration/contentcuration/frontend/shared/views/DialogBox.vue b/contentcuration/contentcuration/frontend/shared/views/DialogBox.vue
deleted file mode 100644
index 13de18043c..0000000000
--- a/contentcuration/contentcuration/frontend/shared/views/DialogBox.vue
+++ /dev/null
@@ -1,47 +0,0 @@
-<template>
-
-  <VDialog
-    :value="value"
-    width="500"
-    persistent
-    @input="$emit('input')"
-  >
-    <VCard>
-      <VCardTitle
-        class="headline"
-        primary-title
-      >
-        {{ title }}
-      </VCardTitle>
-
-      <VCardText>
-        <slot></slot>
-      </VCardText>
-
-      <VDivider />
-
-      <VCardActions>
-        <VSpacer />
-        <slot name="controls"></slot>
-      </VCardActions>
-    </VCard>
-  </VDialog>
-
-</template>
-
-<script>
-
-  export default {
-    name: 'DialogBox',
-    props: {
-      value: {
-        type: Boolean,
-        default: false,
-      },
-      title: {
-        type: String,
-      },
-    },
-  };
-
-</script>
diff --git a/contentcuration/contentcuration/frontend/shared/views/PrimaryDialog.vue b/contentcuration/contentcuration/frontend/shared/views/PrimaryDialog.vue
deleted file mode 100644
index 0990b7405d..0000000000
--- a/contentcuration/contentcuration/frontend/shared/views/PrimaryDialog.vue
+++ /dev/null
@@ -1,113 +0,0 @@
-<template>
-
-  <VDialog
-    v-model="open"
-    :disabled="disabled"
-    attach="body"
-    maxWidth="400"
-    v-bind="$attrs"
-  >
-    <VCard>
-      <VContainer>
-        <VCardTitle v-if="title">
-          <p class="mb-0 title">
-            <b>{{ title }}</b>
-          </p>
-          <p v-if="text" class="mb-0 mt-2 subheading">
-            {{ text }}
-          </p>
-        </VCardTitle>
-        <VCardText>
-          <slot></slot>
-        </VCardText>
-        <VCardActions>
-          <slot name="actions"></slot>
-        </VCardActions>
-      </VContainer>
-    </VCard>
-  </VDialog>
-
-</template>
-
-<script>
-
-  import Vue from 'vue';
-
-  const modalTracker = Vue.observable({
-    open: false,
-    name: '',
-    uid: null,
-  });
-
-  export default {
-    name: 'PrimaryDialog',
-    props: {
-      // Indicates whether the instantiator of this
-      // modal thinks that the modal should be open, but
-      // makes no guarantees.
-      value: {
-        type: Boolean,
-        required: true,
-      },
-      title: {
-        type: String,
-        default: '',
-      },
-      text: {
-        type: String,
-        required: false,
-      },
-    },
-    computed: {
-      disabled() {
-        return modalTracker.open && modalTracker.uid !== this._uid;
-      },
-      open: {
-        get() {
-          return this.value;
-        },
-        set(open) {
-          this.$emit('input', open);
-        },
-      },
-    },
-    watch: {
-      open(newVal) {
-        this.registerOpen(newVal);
-      },
-    },
-    created() {
-      this.registerOpen(this.open);
-    },
-    beforeDestroy() {
-      // Before we tear down this component
-      // run the check should open logic to reset modalTracker state
-      // in case this was already open.
-      this.registerOpen(false);
-    },
-    methods: {
-      registerOpen(openProp) {
-        const name = this.$parent.$options.name;
-        if (!openProp && modalTracker.uid === this._uid && modalTracker.open) {
-          modalTracker.open = false;
-          modalTracker.name = '';
-          modalTracker.uid = null;
-        } else if (openProp && modalTracker.open) {
-          // eslint-disable-next-line no-console
-          console.error(
-            `${name} tried to open the primary modal, but it is in use by: ${modalTracker.name} component.`
-          );
-          this.open = false;
-        } else if (openProp && !modalTracker.open) {
-          modalTracker.open = true;
-          modalTracker.name = name;
-          modalTracker.uid = this._uid;
-        }
-      },
-    },
-  };
-
-</script>
-
-
-<style lang="less" scoped></style>
diff --git a/contentcuration/contentcuration/frontend/shared/views/channel/ChannelTokenModal.vue b/contentcuration/contentcuration/frontend/shared/views/channel/ChannelTokenModal.vue
index 951cbe3702..8cfb53b294 100644
--- a/contentcuration/contentcuration/frontend/shared/views/channel/ChannelTokenModal.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/channel/ChannelTokenModal.vue
@@ -1,34 +1,27 @@
 <template>
 
-  <PrimaryDialog
-    v-model="dialog"
+  <KModal
+    v-if="dialog"
     :title="$tr('copyTitle')"
-    :text="$tr('copyTokenInstructions')"
-    lazy
+    :cancelText="$tr('close')"
+    @cancel="dialog = false"
   >
+    <p>{{ $tr('copyTokenInstructions') }}</p>
     <CopyToken
       :token="channel.primary_token"
       @copied="$emit('copied')"
     />
-    <template v-slot:actions>
-      <VSpacer />
-      <VBtn flat data-test="close" @click="dialog = false">
-        {{ $tr('close') }}
-      </VBtn>
-    </template>
-  </PrimaryDialog>
+  </KModal>
 
 </template>
 
 <script>
 
-  import PrimaryDialog from '../PrimaryDialog';
   import CopyToken from '../CopyToken';
 
   export default {
     name: 'ChannelTokenModal',
     components: {
-      PrimaryDialog,
       CopyToken,
     },
     props: {
diff --git a/contentcuration/contentcuration/management/commands/mark_incomplete.py b/contentcuration/contentcuration/management/commands/mark_incomplete.py
index 8df69f3691..f0b2962f86 100644
--- a/contentcuration/contentcuration/management/commands/mark_incomplete.py
+++ b/contentcuration/contentcuration/management/commands/mark_incomplete.py
@@ -55,7 +55,7 @@ def handle(self, *args, **options):
         count = ContentNode.objects.exclude(kind_id=content_kinds.TOPIC) \
             .exclude(complete=False) \
             .filter(license_id__in=copyright_licenses) \
-            .filter(Q(copyright_holder__isnull=True) | Q(copyright_holder=''))\
+            .filter(Q(copyright_holder__isnull=True) | Q(copyright_holder='')) \
             .order_by() \
             .update(complete=False)
         logging.info('Marked {} invalid copyright holders (finished in {})'.format(count, time.time() - licensestart))
@@ -65,13 +65,13 @@ def handle(self, *args, **options):
         logging.info('Marking file resources...')
         file_check_query = With(File.objects.filter(preset__supplementary=False).values("contentnode_id").order_by(), name="t_file")
 
-        query = file_check_query.join(ContentNode, id=file_check_query.col.contentnode_id, _join_type=LOUTER)\
+        query = file_check_query.join(ContentNode, id=file_check_query.col.contentnode_id, _join_type=LOUTER) \
             .with_cte(file_check_query) \
             .annotate(t_contentnode_id=file_check_query.col.contentnode_id) \
             .exclude(kind_id=content_kinds.TOPIC) \
             .exclude(kind_id=content_kinds.EXERCISE) \
             .exclude(complete=False) \
-            .filter(t_contentnode_id__isnull=True)\
+            .filter(t_contentnode_id__isnull=True) \
             .order_by()
         count = ContentNode.objects.filter(id__in=query.order_by().values_list('id', flat=True)).update(complete=False)
         logging.info('Marked {} invalid file resources (finished in {})'.format(count, time.time() - resourcestart))
@@ -82,12 +82,12 @@ def handle(self, *args, **options):
 
         has_questions_query = With(AssessmentItem.objects.all().values("contentnode_id").order_by(), name="t_assessmentitem")
 
-        query = has_questions_query.join(ContentNode, id=has_questions_query.col.contentnode_id, _join_type=LOUTER)\
+        query = has_questions_query.join(ContentNode, id=has_questions_query.col.contentnode_id, _join_type=LOUTER) \
             .with_cte(has_questions_query) \
             .annotate(t_contentnode_id=has_questions_query.col.contentnode_id) \
             .filter(kind_id=content_kinds.EXERCISE) \
             .exclude(complete=False) \
-            .filter(t_contentnode_id__isnull=True)\
+            .filter(t_contentnode_id__isnull=True) \
             .order_by()
         exercisestart = time.time()
         count = ContentNode.objects.filter(id__in=query.order_by().values_list('id', flat=True)).update(complete=False)
@@ -98,12 +98,12 @@ def handle(self, *args, **options):
 
         exercise_check_query = With(AssessmentItem.objects.exclude(type=exercises.PERSEUS_QUESTION)
                                     .filter(
-                                        Q(question='') |
-                                        Q(answers='[]') |
+                                        Q(question='')
+                                        | Q(answers='[]')
                                         # hack to check if no correct answers
-                                        (~Q(type=exercises.INPUT_QUESTION) & ~Q(answers__iregex=r'"correct":\s*true'))).order_by(), name="t_assessmentitem")
+                                        | (~Q(type=exercises.INPUT_QUESTION) & ~Q(answers__iregex=r'"correct":\s*true'))).order_by(), name="t_assessmentitem")
 
-        query = exercise_check_query.join(ContentNode, id=has_questions_query.col.contentnode_id)\
+        query = exercise_check_query.join(ContentNode, id=has_questions_query.col.contentnode_id) \
             .with_cte(exercise_check_query) \
             .annotate(t_contentnode_id=exercise_check_query.col.contentnode_id) \
             .filter(kind_id=content_kinds.EXERCISE) \
@@ -116,14 +116,14 @@ def handle(self, *args, **options):
 
         exercisestart = time.time()
         logging.info('Marking mastery_model less exercises...')
-        count = ContentNode.objects.exclude(complete=False).filter(kind_id=content_kinds.EXERCISE).filter(~Q(extra_fields__has_key='mastery_model'))\
+        count = ContentNode.objects.exclude(complete=False).filter(kind_id=content_kinds.EXERCISE).filter(~Q(extra_fields__has_key='mastery_model')) \
             .order_by().update(complete=False)
         logging.info('Marked {} mastery_model less exercises(finished in {})'.format(count, time.time() - exercisestart))
 
         exercisestart = time.time()
         logging.info('Marking bad mastery model exercises...')
-        count = ContentNode.objects.exclude(complete=False).filter(kind_id=content_kinds.EXERCISE)\
-            .filter(Q(extra_fields__mastery_model=exercises.M_OF_N) & (~Q(extra_fields__has_key='m') | ~Q(extra_fields__has_key='n')))\
+        count = ContentNode.objects.exclude(complete=False).filter(kind_id=content_kinds.EXERCISE) \
+            .filter(Q(extra_fields__mastery_model=exercises.M_OF_N) & (~Q(extra_fields__has_key='m') | ~Q(extra_fields__has_key='n'))) \
             .order_by().update(complete=False)
         logging.info('Marked {} bad mastery model exercises (finished in {})'.format(count, time.time() - exercisestart))
 
diff --git a/contentcuration/contentcuration/models.py b/contentcuration/contentcuration/models.py
index 43513ead44..2d19b38e2e 100644
--- a/contentcuration/contentcuration/models.py
+++ b/contentcuration/contentcuration/models.py
@@ -184,113 +184,7 @@ def delete(self):
         super(User, self).delete()
 
     def can_edit(self, channel_id):
-        channel = Channel.objects.filter(pk=channel_id).first()
-        if not self.is_admin and channel and not channel.editors.filter(pk=self.pk).exists():
-            raise PermissionDenied("Cannot edit content")
-        return True
-
-    def can_view_channel(self, channel):
-        if channel and channel.public:
-            return True
-        if not self.is_admin and channel and not channel.editors.filter(pk=self.pk).exists() and not channel.viewers.filter(pk=self.pk).exists():
-            raise PermissionDenied("Cannot view content")
-        return True
-
-    def can_view(self, channel_id):
-        channel = Channel.objects.filter(pk=channel_id).first()
-        return self.can_view_channel(channel)
-
-    def can_view_channels(self, channels):
-        channels_user_has_perms_for = channels.filter(Q(editors__id__contains=self.id) | Q(viewers__id__contains=self.id) | Q(public=True))
-        # The channel user has perms for is a subset of all the channels that were passed in.
-        # We check the count for simplicity, as if the user does not have permissions for
-        # even one of the channels the content is drawn from, then the number of channels
-        # will be smaller.
-        total_channels = channels.distinct().count()
-        # If no channels, then these nodes are orphans - do not let them be viewed except by an admin.
-        if not total_channels or total_channels > channels_user_has_perms_for.distinct().count():
-            raise PermissionDenied("Cannot view content")
-        return True
-
-    def can_view_channel_ids(self, channel_ids):
-        if self.is_admin:
-            return True
-        channels = Channel.objects.filter(pk__in=channel_ids)
-        return self.can_view_channels(channels)
-
-    def can_view_node(self, node):
-        if self.is_admin:
-            return True
-        root = node.get_root()
-        if root == self.clipboard_tree or root.pk == settings.ORPHANAGE_ROOT_ID:
-            return True
-        channel_id = Channel.objects.filter(Q(main_tree=root)
-                                            | Q(chef_tree=root)
-                                            | Q(trash_tree=root)
-                                            | Q(staging_tree=root)
-                                            | Q(previous_tree=root)).values_list("id", flat=True).first()
-        if not channel_id:
-            # Don't let a non-admin view orphaned nodes
-            raise PermissionDenied("Cannot view content")
-        return self.can_view(channel_id)
-
-    def can_view_nodes(self, nodes):
-        if self.is_admin:
-            return True
-        root_nodes_all = ContentNode.objects.filter(parent=None, tree_id__in=nodes.values_list("tree_id", flat=True).distinct()).distinct()
-        # If all the nodes belong to the clipboard, skip the channel check.
-
-        root_nodes = root_nodes_all.exclude(tree_id=self.clipboard_tree.tree_id).exclude(pk=settings.ORPHANAGE_ROOT_ID)
-        if root_nodes.count() == 0 and root_nodes_all.count() > 0:
-            return True
-
-        channels = Channel.objects.filter(Q(main_tree__in=root_nodes)
-                                          | Q(chef_tree__in=root_nodes)
-                                          | Q(trash_tree__in=root_nodes)
-                                          | Q(staging_tree__in=root_nodes)
-                                          | Q(previous_tree__in=root_nodes))
-        return self.can_view_channels(channels)
-
-    def can_edit_node(self, node):
-        if self.is_admin:
-            return True
-        root = node.get_root()
-        if root == self.clipboard_tree or root.pk == settings.ORPHANAGE_ROOT_ID:
-            return True
-
-        channel_id = Channel.objects.filter(Q(main_tree=root)
-                                            | Q(chef_tree=root)
-                                            | Q(trash_tree=root)
-                                            | Q(staging_tree=root)
-                                            | Q(previous_tree=root)).values_list("id", flat=True).first()
-        if not channel_id:
-            # Don't let a non-admin edit orphaned nodes
-            raise PermissionDenied("Cannot edit content")
-        return self.can_edit(channel_id)
-
-    def can_edit_nodes(self, nodes):
-        if self.is_admin:
-            return True
-        root_nodes_all = ContentNode.objects.filter(parent=None, tree_id__in=nodes.values_list("tree_id", flat=True).distinct()).distinct()
-        # If all the nodes belong to the clipboard, skip the channel check.
-        root_nodes = root_nodes_all.exclude(tree_id=self.clipboard_tree.tree_id).exclude(pk=settings.ORPHANAGE_ROOT_ID)
-        if root_nodes.count() == 0 and root_nodes_all.count() > 0:
-            return True
-        channels = Channel.objects.filter(Q(main_tree__in=root_nodes)
-                                          | Q(chef_tree__in=root_nodes)
-                                          | Q(trash_tree__in=root_nodes)
-                                          | Q(staging_tree__in=root_nodes)
-                                          | Q(previous_tree__in=root_nodes))
-        channels_user_can_edit = channels.filter(editors__id__contains=self.id)
-        # The channel user has perms for is a subset of all the channels that were passed in.
-        # We check the count for simplicity, as if the user does not have permissions for
-        # even one of the channels the content is drawn from, then the number of channels
-        # will be smaller.
-        total_channels = channels.distinct().count()
-        # If no channels, then these nodes are orphans - do not let them be edited except by an admin.
-        if not total_channels or total_channels > channels_user_can_edit.distinct().count():
-            raise PermissionDenied("Cannot edit content")
-        return True
+        return Channel.filter_edit_queryset(Channel.objects.all(), self).filter(pk=channel_id).exists()
 
     def check_space(self, size, checksum):
         active_files = self.get_user_active_files()
@@ -819,6 +713,10 @@ class Channel(models.Model):
         "version",
     ])
 
+    @classmethod
+    def get_editable(cls, user, channel_id):
+        return cls.filter_edit_queryset(cls.objects.all(), user).get(id=channel_id)
+
     @classmethod
     def filter_edit_queryset(cls, queryset, user):
         user_id = not user.is_anonymous() and user.id
@@ -828,7 +726,11 @@ def filter_edit_queryset(cls, queryset, user):
             return queryset.none()
 
         edit = Exists(User.editable_channels.through.objects.filter(user_id=user_id, channel_id=OuterRef("id")))
-        return queryset.annotate(edit=edit).filter(edit=True)
+        queryset = queryset.annotate(edit=edit)
+        if user.is_admin:
+            return queryset
+
+        return queryset.filter(edit=True)
 
     @classmethod
     def filter_view_queryset(cls, queryset, user):
@@ -848,6 +750,9 @@ def filter_view_queryset(cls, queryset, user):
             view=view,
         )
 
+        if user.is_admin:
+            return queryset
+
         permission_filter = Q()
         if user_id:
             pending_channels = Invitation.objects.filter(email=user_email, revoked=False, declined=False, accepted=False).values_list(
@@ -1058,7 +963,11 @@ def filter_edit_queryset(cls, queryset, user):
             return queryset.none()
         user_id = not user.is_anonymous() and user.id
         edit = Exists(User.channel_sets.through.objects.filter(user_id=user_id, channelset_id=OuterRef("id")))
-        return queryset.annotate(edit=edit).filter(edit=True)
+        queryset = queryset.annotate(edit=edit)
+        if user.is_admin:
+            return queryset
+
+        return queryset.filter(edit=True)
 
     @classmethod
     def filter_view_queryset(cls, queryset, user):
@@ -1243,8 +1152,8 @@ def _orphan_tree_id_subquery(cls):
         ).values_list("tree_id", flat=True)[:1]
 
     @classmethod
-    def filter_edit_queryset(cls, queryset, user=None, user_id=None):
-        user_id = user_id or not user.is_anonymous() and user.id
+    def filter_edit_queryset(cls, queryset, user):
+        user_id = not user.is_anonymous() and user.id
 
         queryset = queryset.exclude(pk=settings.ORPHANAGE_ROOT_ID)
 
@@ -1253,9 +1162,14 @@ def filter_edit_queryset(cls, queryset, user=None, user_id=None):
 
         edit_cte = PermissionCTE.editable_channels(user_id)
 
-        return queryset.with_cte(edit_cte).annotate(
+        queryset = queryset.with_cte(edit_cte).annotate(
             edit=edit_cte.exists(cls._permission_filter),
-        ).filter(Q(edit=True) | Q(tree_id=cls._orphan_tree_id_subquery()))
+        )
+
+        if user.is_admin:
+            return queryset
+
+        return queryset.filter(Q(edit=True) | Q(tree_id=cls._orphan_tree_id_subquery()))
 
     @classmethod
     def filter_view_queryset(cls, queryset, user):
@@ -1280,6 +1194,9 @@ def filter_view_queryset(cls, queryset, user):
             view=view_cte.exists(cls._permission_filter),
         )
 
+        if user.is_admin:
+            return queryset
+
         return queryset.filter(
             Q(view=True)
             | Q(edit=True)
@@ -1929,9 +1846,14 @@ def filter_edit_queryset(cls, queryset, user):
 
         edit_cte = PermissionCTE.editable_channels(user_id)
 
-        return queryset.with_cte(edit_cte).annotate(
+        queryset = queryset.with_cte(edit_cte).annotate(
             edit=edit_cte.exists(cls._permission_filter),
-        ).filter(edit=True)
+        )
+
+        if user.is_admin:
+            return queryset
+
+        return queryset.filter(edit=True)
 
     @classmethod
     def filter_view_queryset(cls, queryset, user):
@@ -1956,6 +1878,9 @@ def filter_view_queryset(cls, queryset, user):
             view=view_cte.exists(cls._permission_filter),
         )
 
+        if user.is_admin:
+            return queryset
+
         return queryset.filter(Q(view=True) | Q(edit=True) | Q(public=True))
 
 
@@ -2013,7 +1938,12 @@ def filter_edit_queryset(cls, queryset, user):
             return queryset.none()
 
         cte = PermissionCTE.editable_channels(user_id)
-        return queryset.with_cte(cte).annotate(edit=cte.exists(cls._permission_filter)).filter(
+        queryset = queryset.with_cte(cte).annotate(edit=cte.exists(cls._permission_filter))
+
+        if user.is_admin:
+            return queryset
+
+        return queryset.filter(
             Q(edit=True) | Q(uploaded_by=user, contentnode__isnull=True, assessment_item__isnull=True)
         )
 
@@ -2041,6 +1971,9 @@ def filter_view_queryset(cls, queryset, user):
             view=view_cte.exists(cls._permission_filter),
         )
 
+        if user.is_admin:
+            return queryset
+
         return queryset.filter(
             Q(view=True)
             | Q(edit=True)
@@ -2219,6 +2152,9 @@ def filter_edit_queryset(cls, queryset, user):
         if user.is_anonymous():
             return queryset.none()
 
+        if user.is_admin:
+            return queryset
+
         return queryset.filter(
             Q(email__iexact=user.email)
             | Q(sender=user)
@@ -2230,6 +2166,8 @@ def filter_view_queryset(cls, queryset, user):
         if user.is_anonymous():
             return queryset.none()
 
+        if user.is_admin:
+            return queryset
         return queryset.filter(
             Q(email__iexact=user.email)
             | Q(sender=user)
diff --git a/contentcuration/contentcuration/tasks.py b/contentcuration/contentcuration/tasks.py
index 7669d0dc08..82b1eee719 100644
--- a/contentcuration/contentcuration/tasks.py
+++ b/contentcuration/contentcuration/tasks.py
@@ -38,7 +38,7 @@
 
 # if we're running tests, import our test tasks as well
 if settings.RUNNING_TESTS:
-    from .tasks_test import error_test_task, progress_test_task, test_task
+    from .tasks_test import caught_error_test_task, error_test_task, progress_test_task, test_task
 
 
 STATE_QUEUED = "QUEUED"
@@ -123,7 +123,7 @@ def duplicate_nodes_task(
     target = ContentNode.objects.get(id=target_id)
 
     can_edit_source_channel = ContentNode.filter_edit_queryset(
-        ContentNode.objects.filter(id=source_id), user_id=user_id
+        ContentNode.objects.filter(id=source_id), user=User.objects.get(id=user_id)
     ).exists()
 
     new_node = None
@@ -302,6 +302,7 @@ def sendcustomemails_task(subject, message, query):
         {
             "test": test_task,
             "error-test": error_test_task,
+            "caught-error-test": caught_error_test_task,
             "progress-test": progress_test_task,
         }
     )
@@ -327,9 +328,12 @@ def get_or_create_async_task(task_name, user, **task_args):
         metadata={"args": task_args},
     )
 
-    if qs.exists():
+    try:
         task_info = qs[0]
-    else:
+    except IndexError:
+        task_info = None
+
+    if task_info is None:
         _, task_info = create_async_task(task_name, user, **task_args)
 
     return task_info
diff --git a/contentcuration/contentcuration/tasks_test.py b/contentcuration/contentcuration/tasks_test.py
index 2c50861fba..8624cdda4b 100644
--- a/contentcuration/contentcuration/tasks_test.py
+++ b/contentcuration/contentcuration/tasks_test.py
@@ -32,6 +32,17 @@ def error_test_task(**kwargs):
     raise Exception("I'm sorry Dave, I'm afraid I can't do that.")
 
 
+@app.task(bind=True, name="caught_error_test_task")
+def caught_error_test_task(self, **kwargs):
+    """
+    This is a mock task designed to test that we properly report errors to the client.
+    """
+    try:
+        raise Exception("I'm sorry Dave, I'm afraid I can't do that.")
+    except Exception as e:
+        self.report_exception(e)
+
+
 @app.task(bind=True, name="progress_test_task", track_progress=True)
 def progress_test_task(self, **kwargs):
     """
diff --git a/contentcuration/contentcuration/tests/test_asynctask.py b/contentcuration/contentcuration/tests/test_asynctask.py
index 7acf7d7d26..e49e058715 100644
--- a/contentcuration/contentcuration/tests/test_asynctask.py
+++ b/contentcuration/contentcuration/tests/test_asynctask.py
@@ -15,6 +15,7 @@
 from contentcuration.models import ContentNode
 from contentcuration.models import Task
 from contentcuration.tasks import create_async_task
+from contentcuration.tasks import get_or_create_async_task
 from contentcuration.tasks_test import close_db_connection
 from contentcuration.tasks_test import drop_db_connections_fail
 from contentcuration.tasks_test import drop_db_connections_success
@@ -64,6 +65,25 @@ def test_asynctask_reports_error(self):
             "I'm sorry Dave, I'm afraid I can't do that." in traceback_string
         )
 
+    def test_asynctask_caught_error_reporting(self):
+        """
+        Tests that if a task fails with an error, that the error information is stored in the Task object for later
+        retrieval and analysis.
+        """
+        celery_task, task_info = create_async_task("caught-error-test", self.user, apply_async=False)
+
+        task_info.refresh_from_db()
+        self.assertEqual(task_info.status, states.FAILURE)
+        self.assertTrue("error" in task_info.metadata)
+
+        error = task_info.metadata["error"]
+        self.assertEqual(list(error.keys()), ["message", "traceback"])
+        traceback_string = "\n".join(error["traceback"])
+        self.assertTrue("Exception" in traceback_string)
+        self.assertTrue(
+            "I'm sorry Dave, I'm afraid I can't do that." in traceback_string
+        )
+
     def test_only_create_async_task_creates_task_entry(self):
         """
         Test that we don't add a Task entry when we create a new Celery task outside of the create_async_task API.
@@ -134,6 +154,19 @@ def test_duplicate_nodes_task(self):
                 assert child.original_source_node_id in node_ids
                 assert child.source_node_id in node_ids
 
+    def test_get_or_create_task(self):
+        expected_task = Task.objects.create(
+            task_type="progress-test",
+            status=states.PENDING,
+            user=self.user,
+            metadata={"args": {
+                "is_test": True
+            }}
+        )
+
+        actual_task = get_or_create_async_task("progress-test", self.user, is_test=True)
+        self.assertEqual(expected_task.task_id, actual_task.task_id)
+
 
 class DBFailTestCase(TransactionTestCase):
 
diff --git a/contentcuration/contentcuration/tests/test_models.py b/contentcuration/contentcuration/tests/test_models.py
index 3828836767..793f072d32 100644
--- a/contentcuration/contentcuration/tests/test_models.py
+++ b/contentcuration/contentcuration/tests/test_models.py
@@ -113,6 +113,7 @@ def public_channel(self):
     def anonymous_user(self):
         user = mock.Mock()
         user.is_anonymous.return_value = True
+        user.is_admin = False
         return user
 
     @property
@@ -318,25 +319,6 @@ def test_filter_edit_queryset__public_channel(self):
         self.assertQuerysetDoesNotContain(queryset, pk=settings.ORPHANAGE_ROOT_ID)
         self.assertQuerysetContains(queryset, pk=contentnode.id)
 
-    def test_filter_edit_queryset__public_channel__user_id(self):
-        channel = self.public_channel
-        contentnode = create_contentnode(channel.main_tree_id)
-
-        queryset = ContentNode.filter_edit_queryset(self.base_queryset, user_id=987)
-        self.assertQuerysetDoesNotContain(queryset, pk=settings.ORPHANAGE_ROOT_ID)
-        self.assertQuerysetDoesNotContain(queryset, pk=contentnode.id)
-
-        user = testdata.user()
-        channel.viewers.add(user)
-        queryset = ContentNode.filter_edit_queryset(self.base_queryset, user_id=user.id)
-        self.assertQuerysetDoesNotContain(queryset, pk=settings.ORPHANAGE_ROOT_ID)
-        self.assertQuerysetDoesNotContain(queryset, pk=contentnode.id)
-
-        channel.editors.add(user)
-        queryset = ContentNode.filter_edit_queryset(self.base_queryset, user_id=user.id)
-        self.assertQuerysetDoesNotContain(queryset, pk=settings.ORPHANAGE_ROOT_ID)
-        self.assertQuerysetContains(queryset, pk=contentnode.id)
-
     def test_filter_edit_queryset__public_channel__anonymous(self):
         channel = self.public_channel
         contentnode = create_contentnode(channel.main_tree_id)
@@ -364,25 +346,6 @@ def test_filter_edit_queryset__private_channel(self):
         self.assertQuerysetDoesNotContain(queryset, pk=settings.ORPHANAGE_ROOT_ID)
         self.assertQuerysetContains(queryset, pk=contentnode.id)
 
-    def test_filter_edit_queryset__private_channel__user_id(self):
-        channel = testdata.channel()
-        contentnode = create_contentnode(channel.main_tree_id)
-
-        queryset = ContentNode.filter_edit_queryset(self.base_queryset, user_id=987)
-        self.assertQuerysetDoesNotContain(queryset, pk=settings.ORPHANAGE_ROOT_ID)
-        self.assertQuerysetDoesNotContain(queryset, pk=contentnode.id)
-
-        user = testdata.user()
-        channel.viewers.add(user)
-        queryset = ContentNode.filter_edit_queryset(self.base_queryset, user_id=user.id)
-        self.assertQuerysetDoesNotContain(queryset, pk=settings.ORPHANAGE_ROOT_ID)
-        self.assertQuerysetDoesNotContain(queryset, pk=contentnode.id)
-
-        channel.editors.add(user)
-        queryset = ContentNode.filter_edit_queryset(self.base_queryset, user_id=user.id)
-        self.assertQuerysetDoesNotContain(queryset, pk=settings.ORPHANAGE_ROOT_ID)
-        self.assertQuerysetContains(queryset, pk=contentnode.id)
-
     def test_filter_edit_queryset__private_channel__anonymous(self):
         channel = testdata.channel()
         contentnode = create_contentnode(channel.main_tree_id)
@@ -399,13 +362,6 @@ def test_filter_edit_queryset__orphan_tree(self):
         self.assertQuerysetDoesNotContain(queryset, pk=settings.ORPHANAGE_ROOT_ID)
         self.assertQuerysetContains(queryset, pk=contentnode.id)
 
-    def test_filter_edit_queryset__orphan_tree__user_id(self):
-        contentnode = create_contentnode(settings.ORPHANAGE_ROOT_ID)
-
-        queryset = ContentNode.filter_edit_queryset(self.base_queryset, user_id=987)
-        self.assertQuerysetDoesNotContain(queryset, pk=settings.ORPHANAGE_ROOT_ID)
-        self.assertQuerysetContains(queryset, pk=contentnode.id)
-
     def test_filter_edit_queryset__orphan_tree__anonymous(self):
         contentnode = create_contentnode(settings.ORPHANAGE_ROOT_ID)
 
diff --git a/contentcuration/contentcuration/tests/utils/test_nodes.py b/contentcuration/contentcuration/tests/utils/test_nodes.py
index 19c0265a14..de52da5fc2 100644
--- a/contentcuration/contentcuration/tests/utils/test_nodes.py
+++ b/contentcuration/contentcuration/tests/utils/test_nodes.py
@@ -92,14 +92,12 @@ def test_missing__too_big__forced(self, cache, helper):
         self.node.get_descendant_count.return_value = STALE_MAX_CALCULATION_SIZE + 1
         self.assertCalculation(cache, helper, force=True)
 
-    @mock.patch("contentcuration.utils.nodes.STALE_MAX_CALCULATION_SIZE", 5000)
     def test_missing__small(self, cache, helper):
         self.node.get_descendant_count.return_value = 1
         cache().get_size.return_value = None
         cache().get_modified.return_value = None
         self.assertCalculation(cache, helper)
 
-    @mock.patch("contentcuration.utils.nodes.STALE_MAX_CALCULATION_SIZE", 5000)
     def test_unforced__took_too_long(self, cache, helper):
         self.node.get_descendant_count.return_value = 1
         cache().get_size.return_value = None
@@ -117,7 +115,6 @@ def db_get_size():
             self.assertIsInstance(report_exception.mock_calls[0][1][0], SlowCalculationError)
 
 
-@mock.patch("contentcuration.utils.nodes.STALE_MAX_CALCULATION_SIZE", 5000)
 class CalculateResourceSizeIntegrationTestCase(BaseTestCase):
     """
     Integration test case
diff --git a/contentcuration/contentcuration/tests/views/test_views_internal.py b/contentcuration/contentcuration/tests/views/test_views_internal.py
index 6d551aedda..709b25068c 100644
--- a/contentcuration/contentcuration/tests/views/test_views_internal.py
+++ b/contentcuration/contentcuration/tests/views/test_views_internal.py
@@ -48,46 +48,73 @@ class ApiAddNodesToTreeTestCase(StudioTestCase):
     Tests for contentcuration.views.internal.api_add_nodes_to_tree function.
     """
 
+    def _make_node_data(self):
+        random_data = mixer.blend(SampleContentNodeDataSchema)
+        fileobj = self.fileobj
+        return {
+            "title": random_data.title,
+            "language": "en",
+            "description": random_data.description,
+            "node_id": random_data.node_id,
+            "content_id": random_data.content_id,
+            "source_domain": random_data.source_domain,
+            "source_id": random_data.source_id,
+            "author": random_data.author,
+            "files": [
+                {
+                    "size": fileobj.file_size,
+                    "preset": "video",
+                    "filename": fileobj.filename(),
+                    "original_filename": fileobj.original_filename,
+                    "language": fileobj.language,
+                    "source_url": fileobj.source_url,
+                }
+            ],
+            "kind": "document",
+            "license": "CC BY",
+            "license_description": None,
+            "copyright_holder": random_data.copyright_holder,
+            "questions": [],
+            "extra_fields": "{}",
+            "role": "learner",
+        }
+
     def setUp(self):
         super(ApiAddNodesToTreeTestCase, self).setUp()
         # first setup a test channel...
         self.channel = channel()
         self.root_node = self.channel.main_tree
 
-        # get our random data from mixer
-        random_data = mixer.blend(SampleContentNodeDataSchema)
+        # File used for every node
         self.fileobj = fileobj_video()
-        self.title = random_data.title
+
+        # Valid node
+        valid_node = self._make_node_data()
+        self.title = valid_node["title"]
+
+        # Node with invalid title
+        invalid_title_node = self._make_node_data()
+        invalid_title_node["title"] = ""
+        invalid_title_node["description"] = "invalid_title_node"
+
+        # Node with "Special Permissions" license, but no license description
+        invalid_license_description = self._make_node_data()
+        invalid_license_description["title"] = "invalid_license_description"
+        invalid_license_description["license"] = "Special Permissions"
+        invalid_license_description["license_description"] = ""
+
+        # Node with "CC By" license, but no copyright holder
+        invalid_copyright_holder = self._make_node_data()
+        invalid_copyright_holder["title"] = "invalid_copyright_holder"
+        invalid_copyright_holder["copyright_holder"] = ""
+
         self.sample_data = {
             "root_id": self.root_node.id,
             "content_data": [
-                {
-                    "title": self.title,
-                    "language": "en",
-                    "description": random_data.description,
-                    "node_id": random_data.node_id,
-                    "content_id": random_data.content_id,
-                    "source_domain": random_data.source_domain,
-                    "source_id": random_data.source_id,
-                    "author": random_data.author,
-                    "files": [
-                        {
-                            "size": self.fileobj.file_size,
-                            "preset": "video",
-                            "filename": self.fileobj.filename(),
-                            "original_filename": self.fileobj.original_filename,
-                            "language": self.fileobj.language,
-                            "source_url": self.fileobj.source_url,
-                        }
-                    ],
-                    "kind": "document",
-                    "license": "CC BY",
-                    "license_description": None,
-                    "copyright_holder": random_data.copyright_holder,
-                    "questions": [],
-                    "extra_fields": "{}",
-                    "role": "learner",
-                }
+                valid_node,
+                invalid_title_node,
+                invalid_license_description,
+                invalid_copyright_holder,
             ],
         }
         self.resp = self.admin_client().post(
@@ -137,6 +164,17 @@ def test_associates_file_with_created_node(self):
         # our original file object
         assert f.file_on_disk.read() == self.fileobj.file_on_disk.read()
 
+    def test_invalid_nodes_are_not_complete(self):
+        node_0 = ContentNode.objects.get(title=self.title)
+        node_1 = ContentNode.objects.get(description="invalid_title_node")
+        node_2 = ContentNode.objects.get(title="invalid_license_description")
+        node_3 = ContentNode.objects.get(title="invalid_copyright_holder")
+
+        self.assertTrue(node_0.complete)
+        self.assertFalse(node_1.complete)
+        self.assertFalse(node_2.complete)
+        self.assertFalse(node_3.complete)
+
 
 class ApiAddExerciseNodesToTreeTestCase(StudioTestCase):
     """
diff --git a/contentcuration/contentcuration/tests/viewsets/test_user.py b/contentcuration/contentcuration/tests/viewsets/test_user.py
index e341693cc2..e88b60dd85 100644
--- a/contentcuration/contentcuration/tests/viewsets/test_user.py
+++ b/contentcuration/contentcuration/tests/viewsets/test_user.py
@@ -91,3 +91,27 @@ def test_no_delete_user(self):
             reverse("user-detail", kwargs={"pk": self.user.id})
         )
         self.assertEqual(response.status_code, 405, response.content)
+
+
+class ChannelUserCRUDTestCase(StudioAPITestCase):
+    def setUp(self):
+        super(ChannelUserCRUDTestCase, self).setUp()
+        self.channel = testdata.channel()
+        self.user = testdata.user()
+        self.channel.editors.add(self.user)
+
+    def test_fetch_users(self):
+        self.client.force_authenticate(user=self.user)
+        response = self.client.get(
+            reverse("user-list"), data={"channel": self.channel.id}, format="json",
+        )
+        self.assertEqual(response.status_code, 200, response.content)
+
+    def test_fetch_users_no_permissions(self):
+        new_channel = testdata.channel()
+        self.client.force_authenticate(user=self.user)
+        response = self.client.get(
+            reverse("user-list"), data={"channel": new_channel.id}, format="json",
+        )
+        self.assertEqual(response.status_code, 200, response.content)
+        self.assertEqual(response.json(), [])
diff --git a/contentcuration/contentcuration/utils/celery/tasks.py b/contentcuration/contentcuration/utils/celery/tasks.py
index 846d279b81..f98ae4af5b 100644
--- a/contentcuration/contentcuration/utils/celery/tasks.py
+++ b/contentcuration/contentcuration/utils/celery/tasks.py
@@ -1,4 +1,5 @@
 import math
+import traceback as _traceback
 from functools import partial
 
 from celery import states
@@ -97,8 +98,10 @@ def report_exception(self, e):
         :type e: Exception
         """
         # @see AsyncResult.traceback
-        self.update_state(state=states.FAILURE, traceback=e.__traceback__)
+        traceback = '\n'.join(_traceback.format_tb(e.__traceback__))
+        self.update_state(state=states.FAILURE, traceback=traceback)
         report_exception(e)
+        raise e
 
     def update_state(self, task_id=None, state=None, meta=None, traceback=None):
         """
diff --git a/contentcuration/contentcuration/utils/nodes.py b/contentcuration/contentcuration/utils/nodes.py
index 998bc4009a..2a321bafdf 100644
--- a/contentcuration/contentcuration/utils/nodes.py
+++ b/contentcuration/contentcuration/utils/nodes.py
@@ -353,8 +353,7 @@ def modified_since(self, compare_datetime):
         # return result['modified_since']
 
 
-# TODO: clean up sync vs async calculation switching
-STALE_MAX_CALCULATION_SIZE = 0
+STALE_MAX_CALCULATION_SIZE = 500
 SLOW_UNFORCED_CALC_THRESHOLD = 5
 
 
diff --git a/contentcuration/contentcuration/views/base.py b/contentcuration/contentcuration/views/base.py
index adbb1c2704..6bdb05ffd8 100644
--- a/contentcuration/contentcuration/views/base.py
+++ b/contentcuration/contentcuration/views/base.py
@@ -242,22 +242,16 @@ def channel(request, channel_id):
 
     # Check if channel exists
     try:
-        channel = Channel.objects.get(id=channel_id)
-        channel_id = channel.id
+        channel = Channel.filter_view_queryset(Channel.objects.all(), request.user).get(id=channel_id)
     except Channel.DoesNotExist:
         channel_error = "CHANNEL_EDIT_ERROR_CHANNEL_NOT_FOUND"
-        channel_id = ""
-
-    # Check if user has permission to view channel
-    if channel_id != "":
-        try:
-            request.user.can_view_channel(channel)
-            # If user can view channel, but it's deleted, then we show
-            # an option to restore the channel in the Administration page
-            if channel.deleted:
-                channel_error = 'CHANNEL_EDIT_ERROR_CHANNEL_DELETED'
-        except PermissionDenied:
-            channel_error = "CHANNEL_EDIT_ERROR_CHANNEL_NOT_FOUND"
+        channel = None
+
+    if channel is not None:
+        # If user can view channel, but it's deleted, then we show
+        # an option to restore the channel in the Administration page
+        if channel.deleted:
+            channel_error = 'CHANNEL_EDIT_ERROR_CHANNEL_DELETED'
 
     return render(
         request,
diff --git a/contentcuration/contentcuration/views/internal.py b/contentcuration/contentcuration/views/internal.py
index bf8fe7947b..e62a55f9d0 100644
--- a/contentcuration/contentcuration/views/internal.py
+++ b/contentcuration/contentcuration/views/internal.py
@@ -190,9 +190,7 @@ def api_commit_channel(request):
     try:
         channel_id = data['channel_id']
 
-        request.user.can_edit(channel_id)
-
-        obj = Channel.objects.get(pk=channel_id)
+        obj = Channel.get_editable(request.user, channel_id)
 
         # set original_channel_id and source_channel_id to self since chef tree
         obj.chef_tree.get_descendants(include_self=True).update(original_channel_id=channel_id,
@@ -273,13 +271,12 @@ def api_add_nodes_to_tree(request):
     try:
         content_data = data['content_data']
         parent_id = data['root_id']
-        node = ContentNode.objects.get(id=parent_id)
-        request.user.can_edit_node(node)
+        ContentNode.filter_edit_queryset(ContentNode.objects.all(), request.user).get(id=parent_id)
         return Response({
             "success": True,
             "root_ids": convert_data_to_nodes(request.user, content_data, parent_id)
         })
-    except (ContentNode.DoesNotExist, PermissionDenied):
+    except ContentNode.DoesNotExist:
         return HttpResponseNotFound("No content matching: {}".format(parent_id))
     except KeyError:
         return HttpResponseBadRequest("Required attribute missing from data: {}".format(data))
@@ -298,13 +295,13 @@ def api_publish_channel(request):
     try:
         channel_id = data["channel_id"]
         # Ensure that the user has permission to edit this channel.
-        request.user.can_edit(channel_id)
+        Channel.get_editable(request.user, channel_id)
         call_command("exportchannel", channel_id, user_id=request.user.pk, version_notes=data.get('version_notes'))
         return Response({
             "success": True,
             "channel": channel_id
         })
-    except (KeyError, Channel.DoesNotExist, PermissionDenied):
+    except (KeyError, Channel.DoesNotExist):
         return HttpResponseNotFound("No channel matching: {}".format(data))
     except Exception as e:
         handle_server_error(request)
@@ -318,11 +315,10 @@ def activate_channel_internal(request):
     try:
         data = json.loads(request.body)
         channel_id = data['channel_id']
-        request.user.can_edit(channel_id)
-        channel = Channel.objects.get(pk=channel_id)
+        channel = Channel.get_editable(request.user, channel_id)
         activate_channel(channel, request.user)
         return Response({"success": True})
-    except (Channel.DoesNotExist, PermissionDenied):
+    except Channel.DoesNotExist:
         return HttpResponseNotFound("No channel matching: {}".format(channel_id))
     except Exception as e:
         handle_server_error(request)
@@ -338,9 +334,9 @@ def check_user_is_editor(request):
     try:
         channel_id = data['channel_id']
         try:
-            request.user.can_edit(channel_id)
+            Channel.get_editable(request.user, channel_id)
             return Response({"success": True})
-        except PermissionDenied:
+        except Channel.DoesNotExist:
             return HttpResponseNotFound("Channel not found {}".format(channel_id))
 
     except KeyError:
@@ -361,8 +357,7 @@ def get_tree_data(request):
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
     try:
         channel_id = serializer.validated_data['channel_id']
-        request.user.can_edit(channel_id)
-        channel = Channel.objects.get(pk=channel_id)
+        channel = Channel.get_editable(request.user, channel_id)
         tree_name = "{}_tree".format(serializer.validated_data['tree'])
         tree_root = getattr(channel, tree_name, None)
         if tree_root is None:
@@ -393,8 +388,7 @@ def get_node_tree_data(request):
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
     try:
         channel_id = serializer.validated_data['channel_id']
-        request.user.can_edit(channel_id)
-        channel = Channel.objects.get(pk=channel_id)
+        channel = Channel.get_editable(request.user, channel_id)
         tree_name = "{}_tree".format(serializer.validated_data['tree'])
         tree_root = getattr(channel, tree_name, None)
         if 'node_id' in serializer.validated_data:
@@ -409,7 +403,7 @@ def get_node_tree_data(request):
             'staged': channel.staging_tree is not None
         }
         return Response(response_data)
-    except (Channel.DoesNotExist, PermissionDenied):
+    except Channel.DoesNotExist:
         return HttpResponseNotFound("No channel matching: {}".format(channel_id))
     except Exception as e:
         handle_server_error(request)
@@ -424,8 +418,9 @@ def get_channel_status_bulk(request):
     data = json.loads(request.body)
     try:
         channel_ids = data['channel_ids']
-        for cid in channel_ids:
-            request.user.can_edit(cid)
+        permissioned_ids = set(Channel.filter_edit_queryset(Channel.objects.all(), request.user).filter(id__in=channel_ids).values_list("id", flat=True))
+        if permissioned_ids != set(channel_ids):
+            raise PermissionDenied()
         statuses = {cid: get_status(cid) for cid in data['channel_ids']}
 
         return Response({
@@ -559,7 +554,7 @@ def convert_data_to_nodes(user, content_data, parent_node):
         raise ObjectDoesNotExist("Error creating node: {0}".format(e))
 
 
-def create_node(node_data, parent_node, sort_order):
+def create_node(node_data, parent_node, sort_order):  # noqa: C901
     """ Generate node based on node dict """
     # Make sure license is valid
     license = None
@@ -574,8 +569,20 @@ def create_node(node_data, parent_node, sort_order):
     if isinstance(extra_fields, basestring):
         extra_fields = json.loads(extra_fields)
 
+    # Validate title and license fields
+    is_complete = True
+    title = node_data.get('title', "")
+    license_description = node_data.get('license_description', "")
+    copyright_holder = node_data.get('copyright_holder', "")
+    is_complete &= title != ""
+    if node_data['kind'] != content_kinds.TOPIC:
+        if license.is_custom:
+            is_complete &= license_description != ""
+        if license.copyright_holder_required:
+            is_complete &= copyright_holder != ""
+
     node = ContentNode.objects.create(
-        title=node_data['title'],
+        title=title,
         tree_id=parent_node.tree_id,
         kind_id=node_data['kind'],
         node_id=node_data['node_id'],
@@ -585,8 +592,8 @@ def create_node(node_data, parent_node, sort_order):
         aggregator=node_data.get('aggregator') or "",
         provider=node_data.get('provider') or "",
         license=license,
-        license_description=node_data.get('license_description'),
-        copyright_holder=node_data.get('copyright_holder') or "",
+        license_description=license_description,
+        copyright_holder=copyright_holder,
         parent=parent_node,
         extra_fields=extra_fields,
         sort_order=sort_order,
@@ -595,7 +602,7 @@ def create_node(node_data, parent_node, sort_order):
         language_id=node_data.get('language'),
         freeze_authoring_data=True,
         role_visibility=node_data.get('role') or roles.LEARNER,
-        complete=True,
+        complete=is_complete,
     )
     tags = []
     channel = node.get_channel()
diff --git a/contentcuration/contentcuration/views/nodes.py b/contentcuration/contentcuration/views/nodes.py
index 659cfcba71..cd0b05b3ac 100644
--- a/contentcuration/contentcuration/views/nodes.py
+++ b/contentcuration/contentcuration/views/nodes.py
@@ -3,9 +3,9 @@
 
 from django.conf import settings
 from django.core.cache import cache
-from django.core.exceptions import PermissionDenied
 from django.db.models import Max
 from django.db.models import Q
+from django.http import Http404
 from django.http import HttpResponse
 from django.http import HttpResponseNotFound
 from django.shortcuts import get_object_or_404
@@ -19,6 +19,7 @@
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
 
+from contentcuration.models import Channel
 from contentcuration.models import ContentNode
 from contentcuration.models import Task
 from contentcuration.tasks import create_async_task
@@ -34,13 +35,10 @@ def get_channel_details(request, channel_id):
             channel_id (str): id of channel to get details from
     """
     # Get nodes and channel
-    node = get_object_or_404(ContentNode, channel_main=channel_id)
-    try:
-        if not node.channel_main.filter(public=True).exists():
-            request.user.can_view_node(node)
-    except PermissionDenied:
-        return HttpResponseNotFound("No topic found for {}".format(channel_id))
-    data = get_node_details_cached(node, channel_id=channel_id)
+    channel = get_object_or_404(Channel.filter_view_queryset(Channel.objects.all(), request.user), id=channel_id)
+    if not channel.main_tree:
+        raise Http404
+    data = get_node_details_cached(channel.main_tree, channel_id=channel_id)
     return HttpResponse(json.dumps(data))
 
 
@@ -93,10 +91,9 @@ def get_node_details_cached(node, channel_id=None):
 def get_node_diff(request, updated_id, original_id):
     try:
         # Get queryset to test permissions
-        nodes = ContentNode.objects.filter(Q(pk=updated_id) | Q(pk=original_id))
-        updated = nodes.filter(pk=updated_id).first()
-        original = nodes.filter(pk=original_id).first()
-        request.user.can_view_nodes(nodes)
+        nodes = ContentNode.filter_view_queryset(ContentNode.objects.all(), request.user)
+        updated = nodes.get(pk=updated_id)
+        original = nodes.get(pk=original_id)
 
         # Check to see if diff has been generated
         data = get_diff(updated, original)
@@ -112,7 +109,7 @@ def get_node_diff(request, updated_id, original_id):
 
         if is_generating:
             return Response('Diff is being generated', status=status.HTTP_302_FOUND)
-    except PermissionDenied:
+    except ContentNode.DoesNotExist:
         pass
 
     return Response('Diff is not available', status=status.HTTP_404_NOT_FOUND)
@@ -124,10 +121,11 @@ def get_node_diff(request, updated_id, original_id):
 def generate_node_diff(request, updated_id, original_id):
     try:
         # Get queryset to test permissions
-        nodes = ContentNode.objects.filter(Q(pk=updated_id) | Q(pk=original_id))
-        request.user.can_view_nodes(nodes)
+        nodes = ContentNode.filter_view_queryset(ContentNode.objects.all(), request.user).values("id")
+        nodes.get(pk=updated_id)
+        nodes.get(pk=original_id)
 
-    except PermissionDenied:
+    except ContentNode.DoesNotExist:
         return Response('Diff is not available', status=status.HTTP_403_FORBIDDEN)
 
     # See if there's already a staging task in progress
diff --git a/contentcuration/contentcuration/views/users.py b/contentcuration/contentcuration/views/users.py
index 78c0b6c911..1a6fce6d53 100644
--- a/contentcuration/contentcuration/views/users.py
+++ b/contentcuration/contentcuration/views/users.py
@@ -9,6 +9,7 @@
 from django.contrib.auth.views import PasswordResetView
 from django.contrib.sites.models import Site
 from django.contrib.sites.shortcuts import get_current_site
+from django.core.exceptions import PermissionDenied
 from django.core.mail import send_mail
 from django.core.urlresolvers import reverse_lazy
 from django.http import HttpResponse
@@ -56,7 +57,8 @@ def send_invitation_email(request):
 
         recipient = User.get_for_email(user_email)
 
-        request.user.can_edit(channel_id)
+        if not request.user.can_edit(channel_id):
+            raise PermissionDenied()
 
         fields = {
             "invited": recipient,
diff --git a/contentcuration/contentcuration/viewsets/base.py b/contentcuration/contentcuration/viewsets/base.py
index 6589bcbc26..9ee95420d3 100644
--- a/contentcuration/contentcuration/viewsets/base.py
+++ b/contentcuration/contentcuration/viewsets/base.py
@@ -432,8 +432,6 @@ def get_serializer_class(self):
 
     def get_queryset(self):
         queryset = super(ReadOnlyValuesViewset, self).get_queryset()
-        if self.request.user.is_admin:
-            return queryset
         if hasattr(queryset.model, "filter_view_queryset"):
             return queryset.model.filter_view_queryset(queryset, self.request.user)
         return queryset
@@ -444,8 +442,6 @@ def get_edit_queryset(self):
         that a user is able to edit, rather than view.
         """
         queryset = super(ReadOnlyValuesViewset, self).get_queryset()
-        if self.request.user.is_admin:
-            return queryset
         if hasattr(queryset.model, "filter_edit_queryset"):
             return queryset.model.filter_edit_queryset(queryset, self.request.user)
         return self.get_queryset()
diff --git a/contentcuration/contentcuration/viewsets/channel.py b/contentcuration/contentcuration/viewsets/channel.py
index 11eda6d56e..55accb11f2 100644
--- a/contentcuration/contentcuration/viewsets/channel.py
+++ b/contentcuration/contentcuration/viewsets/channel.py
@@ -3,6 +3,7 @@
 from operator import or_
 
 from django.conf import settings
+from django.db import IntegrityError
 from django.db.models import Exists
 from django.db.models import OuterRef
 from django.db.models import Q
@@ -282,8 +283,12 @@ def create(self, validated_data):
         instance = super(ChannelSerializer, self).create(validated_data)
         if "request" in self.context:
             user = self.context["request"].user
-            # This has been newly created so add the current user as an editor
-            instance.editors.add(user)
+            try:
+                # Wrap in try catch, fix for #3049
+                # This has been newly created so add the current user as an editor
+                instance.editors.add(user)
+            except IntegrityError:
+                pass
             if bookmark:
                 user.bookmarked_channels.add(instance)
         self.changes.append(
diff --git a/contentcuration/contentcuration/viewsets/user.py b/contentcuration/contentcuration/viewsets/user.py
index e88c05a8a0..f83793b0fd 100644
--- a/contentcuration/contentcuration/viewsets/user.py
+++ b/contentcuration/contentcuration/viewsets/user.py
@@ -22,6 +22,7 @@
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
 
+from contentcuration.models import boolean_val
 from contentcuration.models import Channel
 from contentcuration.models import User
 from contentcuration.utils.pagination import get_order_queryset
@@ -160,7 +161,8 @@ class ChannelUserFilter(RequiredFilterSet):
 
     def filter_channel(self, queryset, name, value):
         # Check permissions
-        self.request.user.can_edit(value)
+        if not self.request.user.can_edit(value):
+            return queryset.none().annotate(can_edit=boolean_val(False), can_view=boolean_val(False))
         user_queryset = User.objects.filter(id=OuterRef("id"))
         queryset = queryset.annotate(
             can_edit=Exists(user_queryset.filter(editable_channels=value)),
diff --git a/contentcuration/locale/CSV_FILES/contentcuration/locale/ar_SA/LC_FRONTEND_MESSAGES/contentcuration-messages.json b/contentcuration/locale/CSV_FILES/contentcuration/locale/ar_SA/LC_FRONTEND_MESSAGES/contentcuration-messages.json
index d514e4668a..5a4a0c9c42 100644
--- a/contentcuration/locale/CSV_FILES/contentcuration/locale/ar_SA/LC_FRONTEND_MESSAGES/contentcuration-messages.json
+++ b/contentcuration/locale/CSV_FILES/contentcuration/locale/ar_SA/LC_FRONTEND_MESSAGES/contentcuration-messages.json
@@ -507,6 +507,7 @@
     "SavedSearchesModal.editAction": "تعديل",
     "SavedSearchesModal.deleteAction": "حذف",
     "SavedSearchesModal.closeAction": "إغلاق",
+    "SavedSearchesModal.closeButtonLabel": "إغلاق",
     "SavedSearchesModal.savedSearchesTitle": "عمليات بحث محفوظة",
     "SavedSearchesModal.noSavedSearches": "لا توجد لديك أية عمليات بحث محفوظة",
     "SavedSearchesModal.searchDeletedSnackbar": "تم حذف سجلات البحث",
@@ -1212,4 +1213,4 @@
     "AdministrationAppError.unauthorizedDetails": "يجب أن تكون مسؤولاً في الاستوديو لتتمكن من عرض هذه الصفحة",
     "AdministrationIndex.channelsLabel": "القنوات",
     "AdministrationIndex.usersLabel": "المستخدمون"
-}
\ No newline at end of file
+}
diff --git a/contentcuration/locale/CSV_FILES/contentcuration/locale/es_ES/LC_FRONTEND_MESSAGES/contentcuration-messages.json b/contentcuration/locale/CSV_FILES/contentcuration/locale/es_ES/LC_FRONTEND_MESSAGES/contentcuration-messages.json
index 160f8ed777..d8f30d677c 100644
--- a/contentcuration/locale/CSV_FILES/contentcuration/locale/es_ES/LC_FRONTEND_MESSAGES/contentcuration-messages.json
+++ b/contentcuration/locale/CSV_FILES/contentcuration/locale/es_ES/LC_FRONTEND_MESSAGES/contentcuration-messages.json
@@ -507,6 +507,7 @@
     "SavedSearchesModal.editAction": "Editar",
     "SavedSearchesModal.deleteAction": "Eliminar",
     "SavedSearchesModal.closeAction": "Cerrar",
+    "SavedSearchesModal.closeButtonLabel": "Cerrar",
     "SavedSearchesModal.savedSearchesTitle": "Búsquedas guardadas",
     "SavedSearchesModal.noSavedSearches": "No tiene ninguna búsqueda guardada",
     "SavedSearchesModal.searchDeletedSnackbar": "Búsqueda guardada eliminada",
@@ -673,7 +674,7 @@
     "CatalogFAQ.newContentQuestion": "¿Es Learning Equality quien añade nuevos recursos a los canales?",
     "CatalogFAQ.newContentAnswer": "Nuestro equipo de contenidos añade nuevas fuentes y canales a la biblioteca y actualiza los canales existentes a medida que los creadores de contenido ponen a disposición nuevos materiales.",
     "CatalogFAQ.customContentQuestion": "¿Cómo puedo añadir mis propios materiales o recomendar materiales de otros creadores para esta biblioteca?",
-    "CatalogFAQ.customContentAnswer": "Nos encantaría que se ponga en contacto con nosotros acerca de sus propios materiales o sus recomendaciones. Escribanos a content@learningequality.org.",
+    "CatalogFAQ.customContentAnswer": "Para añadir sus propios materiales, cree una cuenta de Kolibri Studio en https://studio.learningequality.org. Si desea recomendar materiales educativos públicos para incuir a la Biblioteca de Contenidos de Kolibri envíenos un correo electrónico a content@learningequality.org.",
     "CatalogFAQ.usingResourcesHeader": "Acerca del uso de estos recursos",
     "CatalogFAQ.usingContentQuestion": "He encontrado algo que me interesa y me gustaría empezar a usar. ¿Qué debo hacer?",
     "CatalogFAQ.usingContentAnswer": "¡Genial! Todos estos recursos han sido especialmente empaquetados para su uso en Kolibri, nuestra plataforma de Código Abierto para aprender sin conexión, así que por favor revise cómo empezar con Kolibri primero, luego siga las instrucciones para importar materiales.",
@@ -1212,4 +1213,4 @@
     "AdministrationAppError.unauthorizedDetails": "Necesita ser administrador de Studio para ver esta página",
     "AdministrationIndex.channelsLabel": "Canales",
     "AdministrationIndex.usersLabel": "Usuarios"
-}
\ No newline at end of file
+}
diff --git a/contentcuration/locale/CSV_FILES/contentcuration/locale/fr_FR/LC_FRONTEND_MESSAGES/contentcuration-messages.json b/contentcuration/locale/CSV_FILES/contentcuration/locale/fr_FR/LC_FRONTEND_MESSAGES/contentcuration-messages.json
index 8352f83e18..f10079db0f 100644
--- a/contentcuration/locale/CSV_FILES/contentcuration/locale/fr_FR/LC_FRONTEND_MESSAGES/contentcuration-messages.json
+++ b/contentcuration/locale/CSV_FILES/contentcuration/locale/fr_FR/LC_FRONTEND_MESSAGES/contentcuration-messages.json
@@ -507,6 +507,7 @@
     "SavedSearchesModal.editAction": "Modifier",
     "SavedSearchesModal.deleteAction": "Supprimer",
     "SavedSearchesModal.closeAction": "Fermer",
+    "SavedSearchesModal.closeButtonLabel": "Fermer",
     "SavedSearchesModal.savedSearchesTitle": "Recherches enregistrées",
     "SavedSearchesModal.noSavedSearches": "Vous n'avez aucune recherche enregistrée",
     "SavedSearchesModal.searchDeletedSnackbar": "Recherche enregistrée supprimée",
@@ -673,7 +674,7 @@
     "CatalogFAQ.newContentQuestion": "Learning Equality ajoute-t-il de nouveaux supports ?",
     "CatalogFAQ.newContentAnswer": "Notre équipe chargée des contenus ajoute régulièrement de nouvelles sources et chaînes à la bibliothèque, et met à jour les chaînes existantes au fur et à mesure que les créateurs de contenus mettent à disposition de nouveaux supports.",
     "CatalogFAQ.customContentQuestion": "Comment puis-je ajouter mes propres supports ou recommander des supports d'autres créateurs pour cette bibliothèque ?",
-    "CatalogFAQ.customContentAnswer": "Nous serions ravis d'échanger avec vous au sujet de vos propres supports ou de vos recommandations. Merci de nous contacter à l'adresse content@learningequality.org !",
+    "CatalogFAQ.customContentAnswer": "Pour ajouter vos propres matériaux, créez un compte sur Kolibri Studio en allant sur https://studio.learningequality.org. Des recommandations au sujet des types de matériels éducatifs à ajouter à la bibliothèque de contenu de Kolibri peuvent être obtenues en contactant content@learningequality.org.",
     "CatalogFAQ.usingResourcesHeader": "À propos de l'utilisation de ces ressources",
     "CatalogFAQ.usingContentQuestion": "J'ai trouvé quelque chose qui m'intéresse et j'aimerais commencer à l'utiliser. Que dois-je faire ?",
     "CatalogFAQ.usingContentAnswer": "Formidable ! Toutes ces ressources ont été spécifiquement traitées pour permettre leur utilisation sur Kolibri, notre plateforme open source destinée à l'apprentissage hors ligne. Pour commencer, découvrez comment lancer Kolibri, puis suivez les instructions pour y importer des ressources.",
@@ -1212,4 +1213,4 @@
     "AdministrationAppError.unauthorizedDetails": "Il faut être administrateur de Studio pour voir cette page",
     "AdministrationIndex.channelsLabel": "Chaînes",
     "AdministrationIndex.usersLabel": "Utilisateurs"
-}
\ No newline at end of file
+}
diff --git a/contentcuration/locale/CSV_FILES/contentcuration/locale/hi_IN/LC_FRONTEND_MESSAGES/contentcuration-messages.json b/contentcuration/locale/CSV_FILES/contentcuration/locale/hi_IN/LC_FRONTEND_MESSAGES/contentcuration-messages.json
index cc9232641b..58efcd4fc4 100644
--- a/contentcuration/locale/CSV_FILES/contentcuration/locale/hi_IN/LC_FRONTEND_MESSAGES/contentcuration-messages.json
+++ b/contentcuration/locale/CSV_FILES/contentcuration/locale/hi_IN/LC_FRONTEND_MESSAGES/contentcuration-messages.json
@@ -507,6 +507,7 @@
     "SavedSearchesModal.editAction": "Edit",
     "SavedSearchesModal.deleteAction": "Delete",
     "SavedSearchesModal.closeAction": "Close",
+    "SavedSearchesModal.closeButtonLabel": "बंद (close)",
     "SavedSearchesModal.savedSearchesTitle": "Saved searches",
     "SavedSearchesModal.noSavedSearches": "You do not have any saved searches",
     "SavedSearchesModal.searchDeletedSnackbar": "Saved search deleted",
@@ -1212,4 +1213,4 @@
     "AdministrationAppError.unauthorizedDetails": "You need to be an administrator of Studio to view this page",
     "AdministrationIndex.channelsLabel": "Channels",
     "AdministrationIndex.usersLabel": "Users"
-}
\ No newline at end of file
+}
diff --git a/contentcuration/locale/CSV_FILES/contentcuration/locale/pt_BR/LC_FRONTEND_MESSAGES/contentcuration-messages.json b/contentcuration/locale/CSV_FILES/contentcuration/locale/pt_BR/LC_FRONTEND_MESSAGES/contentcuration-messages.json
index 1958ea5d52..ead91b98ff 100644
--- a/contentcuration/locale/CSV_FILES/contentcuration/locale/pt_BR/LC_FRONTEND_MESSAGES/contentcuration-messages.json
+++ b/contentcuration/locale/CSV_FILES/contentcuration/locale/pt_BR/LC_FRONTEND_MESSAGES/contentcuration-messages.json
@@ -507,6 +507,7 @@
     "SavedSearchesModal.editAction": "Edit",
     "SavedSearchesModal.deleteAction": "Delete",
     "SavedSearchesModal.closeAction": "Close",
+    "SavedSearchesModal.closeButtonLabel": "Fechar",
     "SavedSearchesModal.savedSearchesTitle": "Saved searches",
     "SavedSearchesModal.noSavedSearches": "You do not have any saved searches",
     "SavedSearchesModal.searchDeletedSnackbar": "Saved search deleted",
@@ -1212,4 +1213,4 @@
     "AdministrationAppError.unauthorizedDetails": "You need to be an administrator of Studio to view this page",
     "AdministrationIndex.channelsLabel": "Channels",
     "AdministrationIndex.usersLabel": "Users"
-}
\ No newline at end of file
+}
diff --git a/contentcuration/locale/ar/LC_MESSAGES/contentcuration-messages.json b/contentcuration/locale/ar/LC_MESSAGES/contentcuration-messages.json
index 09c2562a77..6c7f48f2da 100644
--- a/contentcuration/locale/ar/LC_MESSAGES/contentcuration-messages.json
+++ b/contentcuration/locale/ar/LC_MESSAGES/contentcuration-messages.json
@@ -1104,6 +1104,7 @@
   "ReviewSelectionsPage.resourcesInTopic": "{count, number} {count, plural, zero {} one {مصدر} two {مصدرين} few {مصادر} many {مصدراً} other {مصادر}}",
   "ReviewSelectionsPage.reviewSelectionHeader": "مراجعة الإختيارات",
   "SavedSearchesModal.cancelAction": "إلغاء",
+  "SavedSearchesModal.closeButtonLabel": "إغلاق",
   "SavedSearchesModal.deleteAction": "حذف",
   "SavedSearchesModal.deleteConfirmation": "هل أنت متأكد من أنك تريد حذف عملية البحث المحفوظة؟",
   "SavedSearchesModal.deleteSearchTitle": "حذف عمليات البحث المحفوظة",
diff --git a/contentcuration/locale/es_ES/LC_MESSAGES/contentcuration-messages.json b/contentcuration/locale/es_ES/LC_MESSAGES/contentcuration-messages.json
index de399b6254..df51ee18b4 100644
--- a/contentcuration/locale/es_ES/LC_MESSAGES/contentcuration-messages.json
+++ b/contentcuration/locale/es_ES/LC_MESSAGES/contentcuration-messages.json
@@ -111,7 +111,7 @@
   "CatalogFAQ.channelQuestion": "¿Qué es un canal?",
   "CatalogFAQ.coachContentAnswer": "La mayoría de los recursos están dirigidos a los estudiantes, pero algunos, como planes de clase, actualizaciones temáticas, guías de aprendizaje profesional y similares, están dirigidos a profesores y tutores. En Kolibri, marcamos este contenido como \"apoyo para tutores\" y limitamos su visibilidad a aquellos usuarios con las cuentas de tutor. Si ves materiales para tutores en el canal, indican que posiblemente se requiere menos planificación por parte de facilitadores que usen esos recursos.",
   "CatalogFAQ.coachContentQuestion": "¿Qué son los 'recursos para tutores'?",
-  "CatalogFAQ.customContentAnswer": "Nos encantaría que se ponga en contacto con nosotros acerca de sus propios materiales o sus recomendaciones. Escribanos a content@learningequality.org.",
+  "CatalogFAQ.customContentAnswer": "Para añadir sus propios materiales, cree una cuenta de Kolibri Studio en https://studio.learningequality.org. Si desea recomendar materiales educativos públicos para incuir a la Biblioteca de Contenidos de Kolibri envíenos un correo electrónico a content@learningequality.org.",
   "CatalogFAQ.customContentQuestion": "¿Cómo puedo añadir mis propios materiales o recomendar materiales de otros creadores para esta biblioteca?",
   "CatalogFAQ.descriptionP1": "Aquí puede aprender más sobre los recursos educativos disponibles para uso público en Kolibri, que están organizados en \"canales\". Utilice los filtros para navegar por los canales por palabra clave, idioma o formatos de los materiales dentro.",
   "CatalogFAQ.descriptionP2": "Haga clic en un canal para obtener una vista previa de los temas y temas que cubre, aprender más sobre su creador, ver cuántos recursos contiene el canal y aprender a importarlo en Kolibri. También puede encontrar contenido específico para tutores (planes de clase, guías profesionales de profesores y otros materiales complementarios de facilitación), evaluaciones y ejercicios y subtítulos para la accesibilidad.",
@@ -1104,6 +1104,7 @@
   "ReviewSelectionsPage.resourcesInTopic": "{count, number} {count, plural, one {material} other {materiales}}",
   "ReviewSelectionsPage.reviewSelectionHeader": "Revisar seleccionado",
   "SavedSearchesModal.cancelAction": "Cancelar",
+  "SavedSearchesModal.closeButtonLabel": "Cerrar",
   "SavedSearchesModal.deleteAction": "Eliminar",
   "SavedSearchesModal.deleteConfirmation": "Confirme que desea eliminar esta búsqueda guardada",
   "SavedSearchesModal.deleteSearchTitle": "Borrar búsqueda guardada",
diff --git a/contentcuration/locale/fr_FR/LC_MESSAGES/contentcuration-messages.json b/contentcuration/locale/fr_FR/LC_MESSAGES/contentcuration-messages.json
index 878eef56ee..d2886e7bc6 100644
--- a/contentcuration/locale/fr_FR/LC_MESSAGES/contentcuration-messages.json
+++ b/contentcuration/locale/fr_FR/LC_MESSAGES/contentcuration-messages.json
@@ -111,7 +111,7 @@
   "CatalogFAQ.channelQuestion": "Qu'est-ce qu'une chaîne ?",
   "CatalogFAQ.coachContentAnswer": "La plupart des ressources sont destinées aux apprenants, mais certaines, telles que les plans de leçon, les remises à niveau sur telle ou telle matière, les guides d'apprentissage professionnel et autres, sont destinées aux enseignants et aux facilitateurs. Dans Kolibri, nous marquons ce contenu comme étant « pour les éducateurs », les seuls à y avoir accès. Alors avis aux planificateurs ! Si vous trouvez ce type de ressource, vous pourriez vous épargner du temps de planification !",
   "CatalogFAQ.coachContentQuestion": "En quoi consistent les « ressources pour les éducateurs » ?",
-  "CatalogFAQ.customContentAnswer": "Nous serions ravis d'échanger avec vous au sujet de vos propres supports ou de vos recommandations. Merci de nous contacter à l'adresse content@learningequality.org !",
+  "CatalogFAQ.customContentAnswer": "Pour ajouter vos propres matériaux, créez un compte sur Kolibri Studio en allant sur https://studio.learningequality.org. Des recommandations au sujet des types de matériels éducatifs à ajouter à la bibliothèque de contenu de Kolibri peuvent être obtenues en contactant content@learningequality.org.",
   "CatalogFAQ.customContentQuestion": "Comment puis-je ajouter mes propres supports ou recommander des supports d'autres créateurs pour cette bibliothèque ?",
   "CatalogFAQ.descriptionP1": "Découvrez dans cette section les ressources pédagogiques, organisées en « chaînes », disponibles en libres accès sur Kolibri. Servez-vous des filtres pour explorer les chaînes par mot-clé, langue ou format de média.",
   "CatalogFAQ.descriptionP2": "Cliquez sur une chaîne pour un aperçu des matières et des thèmes qui y sont abordés, en savoir plus sur son créateur, voir combien de ressources elle regroupe et apprendre comment les importer dans Kolibri. Vous pouvez également y trouver des contenus destinés spécifiquement aux éducateurs (plans de leçons, guides professionnels pour les enseignants et autres supports d'animation supplémentaires), des évaluations et des exercices, et des légendes pour assurer leur accessibilité.",
@@ -1104,6 +1104,7 @@
   "ReviewSelectionsPage.resourcesInTopic": "{count, number} {count, plural, one {ressource} other {ressources}}",
   "ReviewSelectionsPage.reviewSelectionHeader": "Passer en revue la sélection",
   "SavedSearchesModal.cancelAction": "Annuler",
+  "SavedSearchesModal.closeButtonLabel": "Fermer",
   "SavedSearchesModal.deleteAction": "Supprimer",
   "SavedSearchesModal.deleteConfirmation": "Êtes-vous sûr de vouloir supprimer cette recherche enregistrée ?",
   "SavedSearchesModal.deleteSearchTitle": "Supprimer la recherche enregistrée",
diff --git a/contentcuration/locale/hi_IN/LC_MESSAGES/contentcuration-messages.json b/contentcuration/locale/hi_IN/LC_MESSAGES/contentcuration-messages.json
index 59ab7ba0d1..6fa83e6266 100644
--- a/contentcuration/locale/hi_IN/LC_MESSAGES/contentcuration-messages.json
+++ b/contentcuration/locale/hi_IN/LC_MESSAGES/contentcuration-messages.json
@@ -1104,6 +1104,7 @@
   "ReviewSelectionsPage.resourcesInTopic": "{count, number} {count, plural, one {संसाधन} other {संसाधन}}",
   "ReviewSelectionsPage.reviewSelectionHeader": "Review selections",
   "SavedSearchesModal.cancelAction": "रद्द करें",
+  "SavedSearchesModal.closeButtonLabel": "बंद (close)",
   "SavedSearchesModal.deleteAction": "मिटाएँ",
   "SavedSearchesModal.deleteConfirmation": "Are you sure you want to delete this saved search?",
   "SavedSearchesModal.deleteSearchTitle": "Delete saved search",
diff --git a/contentcuration/locale/pt_BR/LC_MESSAGES/contentcuration-messages.json b/contentcuration/locale/pt_BR/LC_MESSAGES/contentcuration-messages.json
index 589efc0df4..57593f3e4b 100644
--- a/contentcuration/locale/pt_BR/LC_MESSAGES/contentcuration-messages.json
+++ b/contentcuration/locale/pt_BR/LC_MESSAGES/contentcuration-messages.json
@@ -1104,6 +1104,7 @@
   "ReviewSelectionsPage.resourcesInTopic": "{count, number} {count, plural, one {recurso} other {recursos}}",
   "ReviewSelectionsPage.reviewSelectionHeader": "Review selections",
   "SavedSearchesModal.cancelAction": "Cancelar",
+  "SavedSearchesModal.closeButtonLabel": "Fechar",
   "SavedSearchesModal.deleteAction": "Excluir",
   "SavedSearchesModal.deleteConfirmation": "Are you sure you want to delete this saved search?",
   "SavedSearchesModal.deleteSearchTitle": "Delete saved search",
diff --git a/requirements-dev.in b/requirements-dev.in
index 61d1fbc93b..48aceb23be 100644
--- a/requirements-dev.in
+++ b/requirements-dev.in
@@ -39,3 +39,4 @@ pypandoc
 git+https://github.com/someshchaturvedi/customizable-django-profiler.git#customizable-django-profiler
 tabulate==0.8.2
 fonttools
+flower==0.9.4
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 9ff1b64632..eb8d6e86eb 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -4,331 +4,134 @@
 #
 #    pip-compile requirements-dev.in
 #
-appdirs==1.4.3
-    # via virtualenv
-aspy.yaml==1.3.0
-    # via pre-commit
-astroid==2.3.3
-    # via pylint
-attrs==19.3.0
-    # via pytest
-autoflake==1.3.1
-    # via -r requirements-dev.in
-autopep8==1.4
-    # via -r requirements-dev.in
-backcall==0.1.0
-    # via ipython
-certifi==2019.11.28
-    # via
-    #   -c requirements.txt
-    #   geventhttpclient
-    #   requests
-cfgv==3.0.0
-    # via pre-commit
-chardet==3.0.4
-    # via
-    #   -c requirements.txt
-    #   requests
-click==7.0
-    # via
-    #   flask
-    #   pip-tools
-codecov==2.0.15
-    # via -r requirements-dev.in
-colorama==0.4.3
-    # via pytest-watch
-configargparse==1.2.3
-    # via locust
-coreapi==2.3.3
-    # via drf-yasg
-coreschema==0.0.4
-    # via
-    #   coreapi
-    #   drf-yasg
-coverage==5.0.3
-    # via
-    #   -r requirements-dev.in
-    #   codecov
-    #   pytest-cov
-git+https://github.com/someshchaturvedi/customizable-django-profiler.git#customizable-django-profiler
-    # via -r requirements-dev.in
-decorator==4.4.1
-    # via
-    #   ipython
-    #   traitlets
-distlib==0.3.0
-    # via virtualenv
-django-concurrent-test-helper==0.7.0
-    # via -r requirements-dev.in
-django-debug-panel==0.8.3
-    # via -r requirements-dev.in
-django-debug-toolbar==1.9.1
-    # via
-    #   -r requirements-dev.in
-    #   django-debug-panel
-django==1.11.29
-    # via
-    #   -c requirements.txt
-    #   django-debug-toolbar
-    #   drf-yasg
-djangorestframework==3.9.1
-    # via
-    #   -c requirements.txt
-    #   drf-yasg
-docopt==0.6.2
-    # via pytest-watch
-drf-yasg==1.17.1
-    # via -r requirements-dev.in
-faker==0.7.3
-    # via
-    #   -r requirements-dev.in
-    #   mixer
-filelock==3.0.12
-    # via virtualenv
-flake8==3.4.1
-    # via -r requirements-dev.in
-flask-basicauth==0.2.0
-    # via locust
-flask==1.1.2
-    # via
-    #   flask-basicauth
-    #   locust
-fonttools==4.17.1
-    # via -r requirements-dev.in
-gevent==20.6.2
-    # via
-    #   geventhttpclient
-    #   locust
-geventhttpclient==1.4.4
-    # via locust
-greenlet==0.4.16
-    # via gevent
-identify==1.4.11
-    # via pre-commit
-idna==2.8
-    # via
-    #   -c requirements.txt
-    #   requests
-importlib-metadata==1.5.0
-    # via pre-commit
-importmagic==0.1.7
-    # via -r requirements-dev.in
-inflection==0.5.0
-    # via drf-yasg
-ipdb==0.12.3
-    # via -r requirements-dev.in
-ipython-genutils==0.2.0
-    # via traitlets
-ipython==7.12.0
-    # via ipdb
-isort==4.3.21
-    # via
-    #   -r requirements-dev.in
-    #   pylint
-    #   pyls-isort
-itsdangerous==1.1.0
-    # via flask
-itypes==1.2.0
-    # via coreapi
-jedi==0.15.2
-    # via
-    #   -r requirements-dev.in
-    #   ipython
-    #   python-language-server
-jinja2==2.11.3
-    # via
-    #   coreschema
-    #   flask
-json-rpc==1.13.0
-    # via -r requirements-dev.in
-lazy-object-proxy==1.4.3
-    # via astroid
-locust==1.1.1
-    # via -r requirements-dev.in
-markupsafe==1.1.1
-    # via jinja2
-mccabe==0.6.1
-    # via
-    #   flake8
-    #   pylint
-mixer==5.6.6
-    # via -r requirements-dev.in
-mock==4.0.1
-    # via
-    #   -r requirements-dev.in
-    #   django-concurrent-test-helper
-more-itertools==8.2.0
-    # via pytest
-msgpack==1.0.0
-    # via locust
-nodeenv==1.3.5
-    # via
-    #   -r requirements-dev.in
-    #   pre-commit
-packaging==20.1
-    # via
-    #   drf-yasg
-    #   pytest
-parso==0.6.1
-    # via jedi
-pathtools==0.1.2
-    # via watchdog
-pexpect==4.8.0
-    # via ipython
-pickleshare==0.7.5
-    # via ipython
-pip-tools==5.3.1
-    # via -r requirements-dev.in
-pluggy==0.13.1
-    # via
-    #   pytest
-    #   python-language-server
-pre-commit==1.15.1
-    # via -r requirements-dev.in
-prompt-toolkit==3.0.3
-    # via ipython
-psutil==5.7.2
-    # via locust
-ptyprocess==0.6.0
-    # via pexpect
-py==1.8.1
-    # via pytest
-pycodestyle==2.3.1
-    # via
-    #   autopep8
-    #   flake8
-pyflakes==1.5.0
-    # via
-    #   autoflake
-    #   flake8
-pygments==2.7.4
-    # via ipython
-pyinstrument-cext==0.2.2
-    # via pyinstrument
-pyinstrument==3.1.4
-    # via -r requirements-dev.in
-pylint==2.4.4
-    # via -r requirements-dev.in
-pyls-isort==0.1.1
-    # via -r requirements-dev.in
-pympler==0.8
-    # via -r requirements-dev.in
-pypandoc==1.5
-    # via -r requirements-dev.in
-pyparsing==2.4.6
-    # via packaging
-pytest-cov==2.8.1
-    # via -r requirements-dev.in
-pytest-django==3.8.0
-    # via -r requirements-dev.in
-pytest-logging==2015.11.4
-    # via -r requirements-dev.in
-pytest-pythonpath==0.7.3
-    # via -r requirements-dev.in
-pytest-timeout==1.4.2
-    # via -r requirements-dev.in
-pytest-watch==4.2.0
-    # via -r requirements-dev.in
-pytest==5.3.5
-    # via
-    #   -r requirements-dev.in
-    #   pytest-cov
-    #   pytest-django
-    #   pytest-logging
-    #   pytest-pythonpath
-    #   pytest-timeout
-    #   pytest-watch
-python-dateutil==2.8.1
-    # via
-    #   -c requirements.txt
-    #   faker
-python-jsonrpc-server==0.3.4
-    # via python-language-server
-python-language-server==0.31.8
-    # via
-    #   -r requirements-dev.in
-    #   pyls-isort
-pytz==2019.3
-    # via
-    #   -c requirements.txt
-    #   django
-pyyaml==5.4
-    # via
-    #   aspy.yaml
-    #   pre-commit
-pyzmq==19.0.2
-    # via locust
-requests==2.22.0
-    # via
-    #   -c requirements.txt
-    #   codecov
-    #   coreapi
-    #   locust
-rope==0.16.0
-    # via -r requirements-dev.in
-ruamel.yaml==0.16.10
-    # via drf-yasg
-service-factory==0.1.6
-    # via -r requirements-dev.in
-six==1.14.0
-    # via
-    #   -c requirements.txt
-    #   astroid
-    #   django-concurrent-test-helper
-    #   drf-yasg
-    #   faker
-    #   geventhttpclient
-    #   packaging
-    #   pip-tools
-    #   pre-commit
-    #   python-dateutil
-    #   traitlets
-    #   virtualenv
-sqlparse==0.3.0
-    # via django-debug-toolbar
-tabulate==0.8.2
-    # via -r requirements-dev.in
-tblib==1.7.0
-    # via django-concurrent-test-helper
-toml==0.10.0
-    # via pre-commit
-traitlets==4.3.3
-    # via ipython
-ujson==1.35
-    # via
-    #   python-jsonrpc-server
-    #   python-language-server
-uritemplate==3.0.1
-    # via
-    #   -c requirements.txt
-    #   coreapi
-    #   drf-yasg
-urllib3==1.25.8
-    # via
-    #   -c requirements.txt
-    #   requests
-virtualenv==20.0.3
-    # via pre-commit
-watchdog==0.10.2
-    # via pytest-watch
-wcwidth==0.1.8
-    # via
-    #   prompt-toolkit
-    #   pytest
-werkzeug==1.0.1
-    # via flask
-wheel==0.35.1
-    # via pypandoc
-wrapt==1.11.2
-    # via astroid
-yapf==0.29.0
-    # via -r requirements-dev.in
-zipp==2.2.0
-    # via importlib-metadata
-zope.event==4.4
-    # via gevent
-zope.interface==5.1.0
-    # via gevent
+amqp==2.5.2               # via -c requirements.txt, kombu
+appdirs==1.4.3            # via virtualenv
+aspy.yaml==1.3.0          # via pre-commit
+astroid==2.3.3            # via pylint
+attrs==19.3.0             # via pytest
+autoflake==1.3.1          # via -r requirements-dev.in
+autopep8==1.4             # via -r requirements-dev.in
+backcall==0.1.0           # via ipython
+billiard==3.5.0.5         # via -c requirements.txt, celery
+celery==4.1.1             # via -c requirements.txt, flower
+certifi==2019.11.28       # via -c requirements.txt, geventhttpclient, requests
+cfgv==3.0.0               # via pre-commit
+chardet==3.0.4            # via -c requirements.txt, requests
+click==7.0                # via flask, pip-tools
+codecov==2.0.15           # via -r requirements-dev.in
+colorama==0.4.3           # via pytest-watch
+configargparse==1.2.3     # via locust
+coreapi==2.3.3            # via drf-yasg
+coreschema==0.0.4         # via coreapi, drf-yasg
+coverage==5.0.3           # via -r requirements-dev.in, codecov, pytest-cov
+git+https://github.com/someshchaturvedi/customizable-django-profiler.git#customizable-django-profiler  # via -r requirements-dev.in
+decorator==4.4.1          # via ipython, traitlets
+distlib==0.3.0            # via virtualenv
+django-concurrent-test-helper==0.7.0  # via -r requirements-dev.in
+django-debug-panel==0.8.3  # via -r requirements-dev.in
+django-debug-toolbar==1.9.1  # via -r requirements-dev.in, django-debug-panel
+django==1.11.29           # via -c requirements.txt, django-debug-toolbar, drf-yasg
+djangorestframework==3.9.1  # via -c requirements.txt, drf-yasg
+docopt==0.6.2             # via pytest-watch
+drf-yasg==1.17.1          # via -r requirements-dev.in
+faker==0.7.3              # via -r requirements-dev.in, mixer
+filelock==3.0.12          # via virtualenv
+flake8==3.4.1             # via -r requirements-dev.in
+flask-basicauth==0.2.0    # via locust
+flask==1.1.2              # via flask-basicauth, locust
+flower==0.9.4             # via -r requirements-dev.in
+fonttools==4.17.1         # via -r requirements-dev.in
+gevent==20.6.2            # via geventhttpclient, locust
+geventhttpclient==1.4.4   # via locust
+greenlet==0.4.16          # via gevent
+humanize==0.5.1           # via flower
+identify==1.4.11          # via pre-commit
+idna==2.8                 # via -c requirements.txt, requests
+importlib-metadata==1.5.0  # via importlib-resources, pluggy, pre-commit, pytest, virtualenv
+importlib-resources==1.5.0  # via pre-commit, virtualenv
+importmagic==0.1.7        # via -r requirements-dev.in
+inflection==0.5.0         # via drf-yasg
+ipdb==0.12.3              # via -r requirements-dev.in
+ipython-genutils==0.2.0   # via traitlets
+ipython==7.12.0           # via ipdb
+isort==4.3.21             # via -r requirements-dev.in, pylint, pyls-isort
+itsdangerous==1.1.0       # via flask
+itypes==1.2.0             # via coreapi
+jedi==0.15.2              # via -r requirements-dev.in, ipython, python-language-server
+jinja2==2.11.3            # via coreschema, flask
+json-rpc==1.13.0          # via -r requirements-dev.in
+kombu==4.3.0              # via -c requirements.txt, celery
+lazy-object-proxy==1.4.3  # via astroid
+locust==1.1.1             # via -r requirements-dev.in
+markupsafe==1.1.1         # via jinja2
+mccabe==0.6.1             # via flake8, pylint
+mixer==5.6.6              # via -r requirements-dev.in
+mock==4.0.1               # via -r requirements-dev.in, django-concurrent-test-helper
+more-itertools==8.2.0     # via pytest
+msgpack==1.0.0            # via locust
+nodeenv==1.3.5            # via -r requirements-dev.in, pre-commit
+packaging==20.1           # via drf-yasg, pytest
+parso==0.6.1              # via jedi
+pathtools==0.1.2          # via watchdog
+pexpect==4.8.0            # via ipython
+pickleshare==0.7.5        # via ipython
+pip-tools==5.3.1          # via -r requirements-dev.in
+pluggy==0.13.1            # via pytest, python-language-server
+pre-commit==1.15.1        # via -r requirements-dev.in
+prompt-toolkit==3.0.3     # via ipython
+psutil==5.7.2             # via locust
+ptyprocess==0.6.0         # via pexpect
+py==1.8.1                 # via pytest
+pycodestyle==2.3.1        # via autopep8, flake8
+pyflakes==1.5.0           # via autoflake, flake8
+pygments==2.7.4           # via ipython
+pyinstrument-cext==0.2.2  # via pyinstrument
+pyinstrument==3.1.4       # via -r requirements-dev.in
+pylint==2.4.4             # via -r requirements-dev.in
+pyls-isort==0.1.1         # via -r requirements-dev.in
+pympler==0.8              # via -r requirements-dev.in
+pypandoc==1.5             # via -r requirements-dev.in
+pyparsing==2.4.6          # via packaging
+pytest-cov==2.8.1         # via -r requirements-dev.in
+pytest-django==3.8.0      # via -r requirements-dev.in
+pytest-logging==2015.11.4  # via -r requirements-dev.in
+pytest-pythonpath==0.7.3  # via -r requirements-dev.in
+pytest-timeout==1.4.2     # via -r requirements-dev.in
+pytest-watch==4.2.0       # via -r requirements-dev.in
+pytest==5.3.5             # via -r requirements-dev.in, pytest-cov, pytest-django, pytest-logging, pytest-pythonpath, pytest-timeout, pytest-watch
+python-dateutil==2.8.1    # via -c requirements.txt, faker
+python-jsonrpc-server==0.3.4  # via python-language-server
+python-language-server==0.31.8  # via -r requirements-dev.in, pyls-isort
+pytz==2019.3              # via -c requirements.txt, celery, django, flower
+pyyaml==5.4               # via aspy.yaml, pre-commit
+pyzmq==19.0.2             # via locust
+requests==2.22.0          # via -c requirements.txt, codecov, coreapi, locust
+rope==0.16.0              # via -r requirements-dev.in
+ruamel.yaml.clib==0.2.2   # via ruamel.yaml
+ruamel.yaml==0.16.10      # via drf-yasg
+service-factory==0.1.6    # via -r requirements-dev.in
+six==1.14.0               # via -c requirements.txt, astroid, django-concurrent-test-helper, drf-yasg, faker, geventhttpclient, packaging, pip-tools, pre-commit, python-dateutil, traitlets, virtualenv
+sqlparse==0.3.0           # via django-debug-toolbar
+tabulate==0.8.2           # via -r requirements-dev.in
+tblib==1.7.0              # via django-concurrent-test-helper
+toml==0.10.0              # via pre-commit
+tornado==6.1              # via flower
+traitlets==4.3.3          # via ipython
+typed-ast==1.4.3          # via astroid
+ujson==1.35               # via python-jsonrpc-server, python-language-server
+uritemplate==3.0.1        # via -c requirements.txt, coreapi, drf-yasg
+urllib3==1.25.8           # via -c requirements.txt, requests
+vine==1.3.0               # via -c requirements.txt, amqp
+virtualenv==20.0.3        # via pre-commit
+watchdog==0.10.2          # via pytest-watch
+wcwidth==0.1.8            # via prompt-toolkit, pytest
+werkzeug==1.0.1           # via flask
+wheel==0.35.1             # via pypandoc
+wrapt==1.11.2             # via astroid
+yapf==0.29.0              # via -r requirements-dev.in
+zipp==2.2.0               # via importlib-metadata, importlib-resources
+zope.event==4.4           # via gevent
+zope.interface==5.1.0     # via gevent
 
 # The following packages are considered to be unsafe in a requirements file:
 # pip
diff --git a/yarn.lock b/yarn.lock
index 3ca43f7549..319ee6e146 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -17947,9 +17947,9 @@ sshpk@^1.7.0:
     tweetnacl "~0.14.0"
 
 ssri@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
-  integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5"
+  integrity sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==
   dependencies:
     figgy-pudding "^3.5.1"