diff --git a/kolibri/core/assets/src/constants.js b/kolibri/core/assets/src/constants.js
index 0724341583e..18538e610dc 100644
--- a/kolibri/core/assets/src/constants.js
+++ b/kolibri/core/assets/src/constants.js
@@ -198,3 +198,5 @@ export const Presets = Object.freeze({
 // This should be kept in sync with the value in
 // kolibri/core/exams/constants.py
 export const MAX_QUESTIONS_PER_QUIZ_SECTION = 50;
+// this is not used for the actual exam model
+export const MAX_QUESTION_OPTIONS_PER_QUIZ_SECTION = 500;
diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateQuizSection.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateQuizSection.vue
index 1c1bddd34b2..c978a11ddf9 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateQuizSection.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateQuizSection.vue
@@ -1,9 +1,6 @@
 <template>
 
   <div>
-    <p :style="addQuizSectionsStyles">
-      {{ addQuizSections$() }}
-    </p>
 
     <KGrid :style="tabsWrapperStyles">
       <KGridItem
@@ -142,8 +139,11 @@
             :layout4="{ span: 2 }"
           >
             <h2 :style="{ color: $themeTokens.annotation }">
-              {{ questionList$() }}
+              {{ questionsLabel$() }}
             </h2>
+            <p :style="{ color: $themeTokens.annotation, fontSize: '.75rem' }">
+              {{ numberOfReplacementsAvailable$({ count: replacementQuestionPool.length }) }}
+            </p>
           </KGridItem>
           <KGridItem
             class="right-side-heading"
@@ -195,7 +195,7 @@
             <KIconButton
               icon="refresh"
               :tooltip="replaceAction$()"
-              :disabled="selectedActiveQuestions.length === 0"
+              :disabled="!canReplaceQuestions"
               @click="handleReplaceSelection()"
             />
             <KIconButton
@@ -308,14 +308,6 @@
       </div>
 
     </KTabsPanel>
-
-    <NotEnoughResourcesModal
-      v-if="showNotEnoughResourcesModal"
-      :selectedQuestions="selectedActiveQuestions"
-      :availableQuestions="replacementQuestionPool"
-      @close="showNotEnoughResourcesModal = false"
-      @addResources="redirectToSelectResources"
-    />
     <KModal
       v-if="showDeleteConfirmation"
       :title="deleteSectionLabel$()"
@@ -356,7 +348,6 @@
   import commonCoach from '../../common';
   import { PageNames } from '../../../constants';
   import TabsWithOverflow from './TabsWithOverflow';
-  import NotEnoughResourcesModal from './NotEnoughResourcesModal';
 
   const logger = logging.getLogger(__filename);
 
@@ -370,14 +361,12 @@
       DragSortWidget,
       DragHandle,
       TabsWithOverflow,
-      NotEnoughResourcesModal,
     },
     mixins: [commonCoreStrings, commonCoach],
     setup() {
       const {
         sectionLabel$,
         selectAllLabel$,
-        addQuizSections$,
         addSectionLabel$,
         quizSectionsLabel$,
         addQuestionsLabel$,
@@ -387,10 +376,10 @@
         editSectionLabel$,
         deleteSectionLabel$,
         replaceAction$,
-        questionList$,
+        questionsLabel$,
+        numberOfReplacementsAvailable$,
         sectionDeletedNotification$,
         deleteConfirmation$,
-        updateResources$,
         changesSavedSuccessfully$,
         questionsDeletedNotification$,
         expandAll$,
@@ -448,7 +437,6 @@
         expandAll$,
         collapseAll$,
         selectAllLabel$,
-        addQuizSections$,
         quizSectionsLabel$,
         addSectionLabel$,
         addQuestionsLabel$,
@@ -459,7 +447,8 @@
         deleteSectionLabel$,
         questionDeletionConfirmation$,
         replaceAction$,
-        questionList$,
+        questionsLabel$,
+        numberOfReplacementsAvailable$,
         sectionDeletedNotification$,
         deleteConfirmation$,
         changesSavedSuccessfully$,
@@ -474,7 +463,6 @@
         addSection,
         removeSection,
         updateQuiz,
-        updateResources$,
         displaySectionTitle,
         displayQuestionTitle,
 
@@ -504,12 +492,11 @@
           userSelect: this.dragActive ? 'none!important' : 'text',
         };
       },
-      addQuizSectionsStyles() {
-        return {
-          margin: '0 0 1rem 0',
-          padding: '0 0 1rem 0',
-          borderBottom: `1px solid ${this.$themeTokens.fineLine}`,
-        };
+      canReplaceQuestions() {
+        return (
+          this.selectedActiveQuestions.length > 0 &&
+          this.selectedActiveQuestions.length <= this.replacementQuestionPool.length
+        );
       },
       tabsWrapperStyles() {
         return {
@@ -701,10 +688,6 @@
           })
         );
       },
-      redirectToSelectResources() {
-        this.showNotEnoughResourcesModal = false;
-        this.openSelectResources();
-      },
     },
   };
 
diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/NotEnoughResourcesModal.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/NotEnoughResourcesModal.vue
deleted file mode 100644
index 99090ec3639..00000000000
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/NotEnoughResourcesModal.vue
+++ /dev/null
@@ -1,83 +0,0 @@
-<template>
-
-  <KModal
-    :title="notEnoughReplacementsTitle$()"
-  >
-    <p v-if="availableQuestions.length">
-      {{
-        notEnoughReplacementsMessage$({
-          selected: selectedQuestions.length,
-          available: availableQuestions.length,
-        })
-      }}
-    </p>
-    <p v-else>
-      {{ noReplacementsMessage$() }}
-    </p>
-    <p v-if="availableQuestions.length">
-      {{
-        addMoreQuestionsWithNonEmptyPool$()
-      }}
-    </p>
-    <p v-else>
-      {{ addMoreQuestionsWithEmptyPool$() }}
-    </p>
-    <template #actions>
-      <KButtonGroup>
-        <KButton
-          @click="() => $emit('close')"
-        >
-          {{ goBackAction$() }}
-        </KButton>
-        <KButton
-          primary
-          @click="() => $emit('addResources')"
-        >
-          {{ addQuestions$() }}
-        </KButton>
-      </KButtonGroup>
-    </template>
-  </KModal>
-
-</template>
-
-
-<script>
-
-  import { enhancedQuizManagementStrings } from 'kolibri-common/strings/enhancedQuizManagementStrings';
-
-  export default {
-    name: 'NotEnoughResourcesModal',
-    setup() {
-      const {
-        goBackAction$,
-        addQuestions$,
-        notEnoughReplacementsTitle$,
-        notEnoughReplacementsMessage$,
-        addMoreQuestionsWithEmptyPool$,
-        addMoreQuestionsWithNonEmptyPool$,
-        noReplacementsMessage$,
-      } = enhancedQuizManagementStrings;
-      return {
-        goBackAction$,
-        addQuestions$,
-        notEnoughReplacementsTitle$,
-        notEnoughReplacementsMessage$,
-        addMoreQuestionsWithEmptyPool$,
-        addMoreQuestionsWithNonEmptyPool$,
-        noReplacementsMessage$,
-      };
-    },
-    props: {
-      selectedQuestions: {
-        type: Array,
-        required: true,
-      },
-      availableQuestions: {
-        type: Array,
-        required: true,
-      },
-    },
-  };
-
-</script>
diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
index 2026fc32769..98697b72f42 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
@@ -1,16 +1,10 @@
 <template>
 
   <div class="wrapper">
-    <h1 class="section-header" :style="{ color: `${$themeTokens.annotation}` }">
-      {{ activeSectionTitle }}
-    </h1>
-    <span
-      class="divider"
-      :style="{ borderTop: `solid 1px ${$themeTokens.fineLine}` }"
-    >
-    </span>
     <h1 class="section-header">
-      {{ replaceQuestions$() }}
+      {{ replaceQuestions$({
+        sectionTitle: displaySectionTitle(activeSection, activeSectionIndex
+        ) }) }}
     </h1>
     <p>{{ replaceQuestionsHeading$() }}</p>
     <span
@@ -135,7 +129,9 @@
       v-if="showReplacementConfirmation"
       :submitText="coreString('confirmAction')"
       :cancelText="coreString('cancelAction')"
-      :title="replaceQuestions$()"
+      :title="replaceQuestions$({
+        sectionTitle: displaySectionTitle(activeSection, activeSectionIndex)
+      })"
       @cancel="showReplacementConfirmation = false"
       @submit="submitReplacement"
     >
@@ -198,7 +194,7 @@
         numberOfSelectedReplacements$,
         numberOfQuestionsReplaced$,
         noUndoWarning$,
-        selectMoreQuestion$,
+        selectQuestionsToContinue$,
         selectFewerQuestion$,
         collapseAll$,
         expandAll$,
@@ -207,6 +203,7 @@
       const {
         // Computed
         activeSection,
+        activeSectionIndex,
         selectedActiveQuestions,
         activeResourceMap,
         replacementQuestionPool,
@@ -301,6 +298,7 @@
 
         toggleInReplacements,
         activeSection,
+        activeSectionIndex,
         activeSectionTitle,
         selectAllReplacementQuestions,
         selectedActiveQuestions,
@@ -327,11 +325,12 @@
         noUndoWarning$,
         replaceQuestionsExplaination$,
         replaceQuestionsHeading$,
-        selectMoreQuestion$,
+        selectQuestionsToContinue$,
         selectFewerQuestion$,
         collapseAll$,
         expandAll$,
         displayQuestionTitle,
+        displaySectionTitle,
       };
     },
     computed: {
@@ -361,13 +360,9 @@
             count: this.replacements.length,
             total: this.selectedActiveQuestions.length,
           });
-        } else if (unreplacedCount > 0) {
-          return this.selectMoreQuestion$({
-            count: unreplacedCount,
-          });
         } else {
-          return this.selectFewerQuestion$({
-            count: Math.abs(unreplacedCount),
+          return this.selectQuestionsToContinue$({
+            count: this.selectedActiveQuestions.length,
           });
         }
       },
diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ResourceSelection.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ResourceSelection.vue
index c641f1c61bb..98f5859f36a 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ResourceSelection.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ResourceSelection.vue
@@ -5,77 +5,67 @@
       <KCircularLoader />
     </div>
     <div v-else>
-
       <h5 v-if="selectPracticeQuiz" class="select-folder-style">
         {{ selectPracticeQuizLabel$() }}
       </h5>
-      <KGrid v-else>
-        <KGridItem
-          :layout12="{ span: 6 }"
-          :layout8="{ span: 4 }"
-          :layout4="{ span: 2 }"
-        >
-          <h5 class="select-folder-style">
-            {{ selectResourcesDescription$() }}
-          </h5>
-          <span>
-            {{
-              maxNumberOfQuestionsPerSection$({
-                count: MAX_QUESTIONS_PER_QUIZ_SECTION, current: activeQuestions.length
-              })
-            }}
+      <div v-else>
+        <h5 class="select-folder-style">
+          {{ selectResourcesDescription$({
+            sectionTitle: displaySectionTitle(activeSection, activeSectionIndex)
+          }) }}
+        </h5>
+        <p>
+          {{ numberOfQuestionsSelected$({ count: activeQuestions.length }) }}
+          <span
+            class="divider"
+            :style="{ borderTop: `solid 1px ${$themeTokens.fineLine}` }"
+          >
           </span>
-        </KGridItem>
-        <KGridItem
-          :layout12="{ span: 6 }"
-          :layout8="{ span: 4 }"
-          :layout4="{ span: 2 }"
-        >
-          <div class="number-question">
-            <div>
-              <KTextbox
-                ref="numQuest"
-                v-model="questionCount"
-                type="number"
-                :label="numberOfQuestionsLabel$()"
-                :max="maxQuestions"
-                :min="1"
-                :invalid="questionCount > maxQuestions"
-                :invalidText="maxNumberOfQuestions$({ count: maxQuestions })"
-                :showInvalidText="true"
+        </p><p>{{ numberOfQuestionsToAdd$() }}</p>
+        <div class="number-question">
+          <div>
+            <KTextbox
+              ref="numQuest"
+              v-model="questionCount"
+              type="number"
+              :label="numberOfQuestionsLabel$()"
+              :max="maxQuestions"
+              :min="1"
+              :invalid="questionCount > maxQuestions"
+              :invalidText="maxNumberOfQuestions$({ count: maxQuestions })"
+              :showInvalidText="true"
+            />
+          </div>
+          <div>
+            <div
+              :style="borderStyle"
+              class="group-button-border"
+            >
+              <KIconButton
+                icon="minus"
+                aria-hidden="true"
+                class="number-btn"
+                :disabled="questionCount === 1"
+                @click="questionCount -= 1"
+              />
+              <span
+                :style="dividerStyle"
+              > | </span>
+              <KIconButton
+                icon="plus"
+                aria-hidden="true"
+                class="number-btn"
+                :disabled="questionCount >= maxQuestions"
+                @click="questionCount += 1"
               />
-            </div>
-            <div>
-              <div
-                :style="borderStyle"
-                class="group-button-border"
-              >
-                <KIconButton
-                  icon="minus"
-                  aria-hidden="true"
-                  class="number-btn"
-                  :disabled="questionCount === 1"
-                  @click="questionCount -= 1"
-                />
-                <span
-                  :style="dividerStyle"
-                > | </span>
-                <KIconButton
-                  icon="plus"
-                  aria-hidden="true"
-                  class="number-btn"
-                  :disabled="questionCount >= maxQuestions"
-                  @click="questionCount += 1"
-                />
-              </div>
             </div>
           </div>
-        </KGridItem>
-      </KGrid>
+        </div>
+      </div>
 
       <div v-if="!isTopicIdSet && bookmarks.length && !showBookmarks">
 
-        <p>{{ selectFromBookmarks$() }}</p>
+        <p>{{ coreString('selectFromBookmarks') }}</p>
 
         <div>
           <KRouterLink
@@ -97,19 +87,6 @@
         </div>
       </div>
 
-      <div
-        v-if="showTopicSizeWarning"
-        class="shadow"
-        :style=" {
-          padding: '1em',
-          marginTop: '1em',
-          marginBottom: '1em',
-          backgroundColor: $themePalette.grey.v_100,
-        }"
-      >
-        {{ cannotSelectSomeTopicWarning$({ count: 12 }) }}
-      </div>
-
       <ResourceSelectionBreadcrumbs
         v-if="isTopicIdSet"
         :ancestors="[...topic.ancestors, topic]"
@@ -123,6 +100,19 @@
         @searchterm="handleSearchTermChange"
       />
 
+      <div
+        v-if="showNumberOfQuestionsWarning"
+        class="shadow"
+        :style=" {
+          padding: '1em',
+          marginTop: '2em',
+          marginBottom: '2em',
+          backgroundColor: $themePalette.grey.v_100,
+        }"
+      >
+        {{ cannotSelectSomeTopicWarning$({ count: 500 }) }}
+      </div>
+
       <ContentCardList
         :contentList="contentList"
         :showSelectAll="showSelectAll"
@@ -130,7 +120,7 @@
         :selectAllChecked="selectAllChecked"
         :selectAllIndeterminate="selectAllIndeterminate"
         :contentIsChecked="contentPresentInWorkingResourcePool"
-        :contentHasCheckbox="actuallyHasCheckbox"
+        :contentHasCheckbox="folderDoesNotHaveTooManyQuestions || hasCheckbox"
         :contentCardMessage="selectionMetadata"
         :contentCardLink="contentLink"
         :loadingMoreState="loadingMore"
@@ -138,29 +128,34 @@
         @changeselectall="handleSelectAll"
         @change_content_card="toggleSelected"
         @moreresults="fetchMoreResources"
-      >
-        <template #notice="{ content }">
-          <span style="position: absolute; bottom: 1em;">{{ cardNoticeContent(content) }}</span>
-        </template>
-      </ContentCardList>
+      />
 
       <div class="bottom-navigation">
         <KGrid>
           <KGridItem
-            :layout12="{ span: 6 }"
+            :layout12="{ span: 8 }"
             :layout8="{ span: 4 }"
             :layout4="{ span: 2 }"
           >
             <span v-if="!selectPracticeQuiz">
-              {{
-                questionsFromResources$({
-                  questions: workingPoolUnusedQuestions, resources: workingResourcePool.length
-                })
-              }}
+              <span v-if="workingPoolUnusedQuestions > maxSectionQuestionOptions">
+                {{
+                  tooManyQuestions$({
+                    count: maxSectionQuestionOptions
+                  })
+                }}
+              </span>
+              <span v-else>
+                {{
+                  questionsFromResources$({
+                    questions: workingPoolUnusedQuestions
+                  })
+                }}
+              </span>
             </span>
           </KGridItem>
           <KGridItem
-            :layout12="{ span: 6 }"
+            :layout12="{ span: 4 }"
             :layout8="{ span: 4 }"
             :layout4="{ span: 2 }"
           >
@@ -197,11 +192,18 @@
   import get from 'lodash/get';
   import uniqWith from 'lodash/uniqWith';
   import isEqual from 'lodash/isEqual';
-  import { enhancedQuizManagementStrings } from 'kolibri-common/strings/enhancedQuizManagementStrings';
+  import {
+    displaySectionTitle,
+    enhancedQuizManagementStrings,
+  } from 'kolibri-common/strings/enhancedQuizManagementStrings';
   import { computed, ref, getCurrentInstance, watch } from 'kolibri.lib.vueCompositionApi';
   import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
   import { ContentNodeResource, ChannelResource } from 'kolibri.resources';
-  import { ContentNodeKinds, MAX_QUESTIONS_PER_QUIZ_SECTION } from 'kolibri.coreVue.vuex.constants';
+  import {
+    ContentNodeKinds,
+    MAX_QUESTIONS_PER_QUIZ_SECTION,
+    MAX_QUESTION_OPTIONS_PER_QUIZ_SECTION,
+  } from 'kolibri.coreVue.vuex.constants';
   import useKResponsiveWindow from 'kolibri-design-system/lib/composables/useKResponsiveWindow';
   import { exerciseToQuestionArray } from '../../../utils/selectQuestions';
   import { PageNames, ViewMoreButtonStates } from '../../../constants/index';
@@ -231,6 +233,7 @@
       const showBookmarks = computed(() => route.value.query.showBookmarks);
       const searchQuery = computed(() => route.value.query.search);
       const {
+        activeSection,
         activeSectionIndex,
         allResourceMap,
         updateSection,
@@ -244,27 +247,29 @@
       const maxQuestions = computed(
         () => MAX_QUESTIONS_PER_QUIZ_SECTION - activeQuestions.value.length
       );
+      const maxSectionQuestionOptions = computed(() => MAX_QUESTION_OPTIONS_PER_QUIZ_SECTION);
+
       const questionCount = ref(Math.min(10, maxQuestions.value));
 
       const selectPracticeQuiz = computed(() => props.selectPracticeQuiz);
 
       const {
         sectionSettings$,
-        selectFromBookmarks$,
         numberOfSelectedBookmarks$,
         selectResourcesDescription$,
         questionsFromResources$,
         changesSavedSuccessfully$,
-        selectedQuestionsInformation$,
         cannotSelectSomeTopicWarning$,
         closeConfirmationMessage$,
         closeConfirmationTitle$,
         questionsUnusedInSection$,
+        numberOfQuestionsSelected$,
+        numberOfQuestionsToAdd$,
+        maxNumberOfQuestions$,
+        tooManyQuestions$,
         selectQuiz$,
         selectPracticeQuizLabel$,
         numberOfQuestionsLabel$,
-        maxNumberOfQuestions$,
-        maxNumberOfQuestionsPerSection$,
         addNumberOfQuestions$,
       } = enhancedQuizManagementStrings;
 
@@ -306,7 +311,10 @@
        */
       function selectableContentList() {
         return contentList.value.reduce((newList, content) => {
-          if (content.kind === ContentNodeKinds.TOPIC && actuallyHasCheckbox(content)) {
+          if (
+            content.kind === ContentNodeKinds.TOPIC &&
+            folderDoesNotHaveTooManyQuestions(content)
+          ) {
             newList = [...newList, ...content.children.results];
           } else {
             newList.push(content);
@@ -387,7 +395,7 @@
       const showSelectAll = computed(() => {
         return (
           !selectPracticeQuiz.value &&
-          contentList.value.every(content => actuallyHasCheckbox(content))
+          contentList.value.every(content => folderDoesNotHaveTooManyQuestions(content))
         );
       });
 
@@ -463,20 +471,23 @@
           const questionItemsAvailable = questionItems.length - questionsItemsAlreadyUsed.length;
           return questionItemsAvailable;
         }
+        if (content.kind === ContentNodeKinds.TOPIC || content.kind === ContentNodeKinds.CHANNEL) {
+          const total = content.num_assessments;
+          const numberOfQuestionsSelected = allQuestionsInQuiz.value.filter(question => {
+            const questionNode = allResourceMap.value[question.exercise_id];
+            for (const ancestor of questionNode.ancestors) {
+              if (ancestor.id === content.id) {
+                return true;
+              }
+            }
+            return false;
+          }).length;
+          return total - numberOfQuestionsSelected;
+        }
         return -1;
       }
-      /**
-       * Uses the imported `hasCheckbox` method in addition to some locally relevant conditions
-       * to identify if the content has a checkbox.
-       * For Exercises, we make sure there are questions available in the resource
-       * For Topics, we make sure that there are questions available in the children
-       * -- Note that for topics, hasCheckbox will only be true if all children are Exercises,
-       *    so we can call this recursively without worrying about it going too deep
-       */
-      function actuallyHasCheckbox(content) {
-        return content.kind === ContentNodeKinds.EXERCISE
-          ? hasCheckbox(content) && unusedQuestionsCount(content) > 0
-          : hasCheckbox(content) && content.children.results.some(actuallyHasCheckbox);
+      function folderDoesNotHaveTooManyQuestions(content) {
+        return content.kind == ContentNodeKinds.EXERCISE || content.num_assessments < 500;
       }
 
       // Load up the channels
@@ -602,14 +613,17 @@
         return (
           !workingPoolHasChanged.value ||
           workingPoolUnusedQuestions.value < questionCount.value ||
-          questionCount.value > maxQuestions.value ||
-          questionCount.value < 1
+          questionCount.value < 1 ||
+          workingPoolUnusedQuestions.value > maxSectionQuestionOptions.value
         );
       });
 
       return {
-        actuallyHasCheckbox,
+        folderDoesNotHaveTooManyQuestions,
+        displaySectionTitle,
+        hasCheckbox,
         unusedQuestionsCount,
+        activeSection,
         activeSectionIndex,
         activeQuestions,
         addSection,
@@ -636,6 +650,7 @@
         contentPresentInWorkingResourcePool,
         questionCount,
         maxQuestions,
+        maxSectionQuestionOptions,
         MAX_QUESTIONS_PER_QUIZ_SECTION,
         workingPoolUnusedQuestions,
         disableSave,
@@ -644,7 +659,9 @@
         closeConfirmationTitle$,
         changesSavedSuccessfully$,
         sectionSettings$,
-        selectFromBookmarks$,
+        numberOfQuestionsSelected$,
+        tooManyQuestions$,
+        maxNumberOfQuestions$,
         numberOfSelectedBookmarks$,
         questionsUnusedInSection$,
         selectResourcesDescription$,
@@ -660,12 +677,10 @@
         addToWorkingResourcePool,
         removeFromWorkingResourcePool,
         showBookmarks,
-        selectedQuestionsInformation$,
         selectQuiz$,
+        numberOfQuestionsToAdd$,
         selectPracticeQuizLabel$,
         numberOfQuestionsLabel$,
-        maxNumberOfQuestions$,
-        maxNumberOfQuestionsPerSection$,
         addNumberOfQuestions$,
       };
     },
@@ -698,8 +713,8 @@
           },
         };
       },
-      showTopicSizeWarning() {
-        return this.contentList.some(this.showTopicSizeWarningCard);
+      showNumberOfQuestionsWarning() {
+        return this.contentList.some(this.showNumberOfQuestionsWarningCard);
       },
       borderStyle() {
         return `border: 1px solid ${this.$themeTokens.fineLine}`;
@@ -729,21 +744,8 @@
       }
     },
     methods: {
-      cardNoticeContent(content) {
-        if (!this.selectPracticeQuiz && content.kind === ContentNodeKinds.EXERCISE) {
-          return this.questionsUnusedInSection$({
-            count: this.unusedQuestionsCount(content),
-          });
-        } else {
-          return '';
-        }
-      },
-      showTopicSizeWarningCard(content) {
-        return (
-          !this.selectPracticeQuiz &&
-          !this.actuallyHasCheckbox(content) &&
-          content.kind === ContentNodeKinds.TOPIC
-        );
+      showNumberOfQuestionsWarningCard(content) {
+        return !this.selectPracticeQuiz && content.num_assessments > 500;
       },
       /** @public */
       focusFirstEl() {
@@ -805,23 +807,20 @@
       },
       // The message put onto the content's card when listed
       selectionMetadata(content) {
-        if (this.selectPracticeQuiz || content.kind !== ContentNodeKinds.TOPIC) {
+        if (this.selectPracticeQuiz) {
           return;
         }
-        const total = content.num_assessments;
-        const numberOfQuestionsSelected = this.allQuestionsInQuiz.filter(question => {
-          const questionNode = this.allResourceMap[question.exercise_id];
-          for (const ancestor of questionNode.ancestors) {
-            if (ancestor.id === content.id) {
-              return true;
-            }
-          }
-          return false;
-        }).length;
 
-        return this.selectedQuestionsInformation$({
-          count: numberOfQuestionsSelected,
-          total: total,
+        const count = this.unusedQuestionsCount(content);
+
+        if (count === -1) {
+          // If for some reason we're getting a content type that we don't know how to handle
+          // we'll just return nothing to avoid displaying a nonsensical message
+          return;
+        }
+
+        return this.questionsUnusedInSection$({
+          count,
         });
       },
       handleSearchTermChange(searchTerm) {
@@ -940,7 +939,6 @@
 
   .number-question {
     display: inline-flex;
-    float: right;
   }
 
   .group-button-border {
@@ -950,4 +948,12 @@
     border: 1px solid;
   }
 
+  .divider {
+    display: block;
+    min-width: 100%;
+    height: 1px;
+    margin: 24px 0;
+    overflow-y: hidden;
+  }
+
 </style>
diff --git a/kolibri/plugins/coach/assets/src/views/plan/LessonResourceSelectionPage/ContentCardList.vue b/kolibri/plugins/coach/assets/src/views/plan/LessonResourceSelectionPage/ContentCardList.vue
index 74e7166b92a..0d66c647014 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/LessonResourceSelectionPage/ContentCardList.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/LessonResourceSelectionPage/ContentCardList.vue
@@ -41,7 +41,7 @@
           class="content-card"
           :disabled="content.is_leaf"
           :tabindex="content.is_leaf ? -1 : 0"
-          :class="{ 'with-checkbox': needCheckboxes, 'is-leaf': content.is_leaf }"
+          :class="{ 'with-checkbox': needCheckboxes }"
           :title="content.title"
           :thumbnail="content.thumbnail"
           :description="content.description"
diff --git a/packages/kolibri-common/strings/enhancedQuizManagementStrings.js b/packages/kolibri-common/strings/enhancedQuizManagementStrings.js
index e48a34e2e6f..0e5955ca31b 100644
--- a/packages/kolibri-common/strings/enhancedQuizManagementStrings.js
+++ b/packages/kolibri-common/strings/enhancedQuizManagementStrings.js
@@ -7,19 +7,10 @@ export const enhancedQuizManagementStrings = createTranslator('EnhancedQuizManag
   sectionLabel: {
     message: 'Section { sectionNumber, number }',
   },
-  createNewQuiz: {
-    message: 'Create new quiz',
-  },
   quizSectionsLabel: {
     message: 'Quiz sections',
     context: 'Used as an aria-label for screen readers to describe the purpose of the list of tabs',
   },
-  quizTitle: {
-    message: 'Quiz title',
-  },
-  addQuizSections: {
-    message: 'Add one or more sections to the quiz, according to your needs',
-  },
   addSectionLabel: {
     message: 'Add section',
   },
@@ -48,18 +39,21 @@ export const enhancedQuizManagementStrings = createTranslator('EnhancedQuizManag
     message: 'Section title',
   },
   sectionTitleUniqueWarning: {
-    message: 'Section titles must be unique within the quiz',
+    message: 'Section title already used',
     context: 'Informs the user that they must use a unique title for each section',
   },
   numberOfQuestionsLabel: {
     message: 'Number of questions',
   },
+  numberOfQuestionsToAdd: {
+    message: 'Number of questions to add',
+  },
+  tooManyQuestions: {
+    message: 'You cannot select more than { count, number } questions',
+  },
   optionalDescriptionLabel: {
     message: 'Description (optional)',
   },
-  selectResources: {
-    message: 'Select resources',
-  },
   sectionOrder: {
     message: 'Section order',
   },
@@ -69,14 +63,11 @@ export const enhancedQuizManagementStrings = createTranslator('EnhancedQuizManag
   applySettings: {
     message: 'Apply settings',
   },
-  addQuestions: {
-    message: 'Add questions',
-  },
   addNumberOfQuestions: {
     message: 'Add { count, number } { count, plural, one { question } other { questions }}',
   },
   selectResourcesDescription: {
-    message: 'Select resources to add questions to this section',
+    message: "Add questions to '{ sectionTitle }'",
   },
   numberOfSelectedBookmarks: {
     message: '{ count, number } { count, plural, one { bookmark } other { bookmarks }}',
@@ -85,23 +76,10 @@ export const enhancedQuizManagementStrings = createTranslator('EnhancedQuizManag
     message: '{count, number} {count, plural, one {question selected} other {questions selected}}',
   },
   maxNumberOfQuestions: {
-    message: 'Max { count, number } { count, plural, one { question } other { questions }}',
-  },
-  maxNumberOfQuestionsPerSection: {
-    message:
-      'Each section may only contain up to { count, number } { count, plural, one { question} other { questions}}, this section has { current, number }',
+    message: 'Maximum number of questions is { count, number }',
   },
   replaceQuestions: {
-    message: 'Replace questions',
-  },
-  changeResources: {
-    message: 'Change resources',
-  },
-  questionList: {
-    message: 'Question list',
-  },
-  addAnswer: {
-    message: 'Add answer',
+    message: 'Replace questions in { sectionTitle }',
   },
   collapseAll: {
     message: 'Collapse all',
@@ -112,6 +90,13 @@ export const enhancedQuizManagementStrings = createTranslator('EnhancedQuizManag
   replaceAction: {
     message: 'Replace',
   },
+  noLearnersEnrolled: {
+    message: 'No learners enrolled in { className }',
+  },
+  noResourcesAvailable: {
+    message:
+      'There are no resources on your device yet. Ask an administrator to add resources to your device.',
+  },
   replaceQuestionsHeading: {
     message: 'The new questions you select will replace the current ones.',
   },
@@ -121,13 +106,6 @@ export const enhancedQuizManagementStrings = createTranslator('EnhancedQuizManag
   noUndoWarning: {
     message: "You can't undo or cancel this.",
   },
-  resourceMismatchWarning: {
-    message: 'The resource you chose does not match the number of questions you want to replace.',
-  },
-  resourceMismatchDirection: {
-    message:
-      'Please choose a different resource or decrease the number of questions to be replaced.',
-  },
   sectionOrderLabel: {
     message: 'Section order',
     context: 'A label for the place where the section order option is shown.',
@@ -138,9 +116,6 @@ export const enhancedQuizManagementStrings = createTranslator('EnhancedQuizManag
   randomizedLabel: {
     message: 'Randomized',
   },
-  selectFromBookmarks: {
-    message: 'Select from bookmarks',
-  },
   randomizedOptionDescription: {
     message: 'Each learner sees a different question order',
   },
@@ -156,14 +131,8 @@ export const enhancedQuizManagementStrings = createTranslator('EnhancedQuizManag
   fixedSectionOptionDescription: {
     message: 'Each learner sees the same section order',
   },
-  questionEditedSuccessfully: {
-    message: 'Question edited successfully',
-  },
-  reviewSelectedResources: {
-    message: 'Review selected resources',
-  },
   deleteConfirmation: {
-    message: "Are you sure you want to delete section '{section_title}'?",
+    message: "Are you sure you want to delete '{section_title}'?",
     context:
       'A warning message that appears when the user tries to leave the page without saving their work',
   },
@@ -182,27 +151,19 @@ export const enhancedQuizManagementStrings = createTranslator('EnhancedQuizManag
     message:
       '{ count, number } of { total, number } {total, plural, one {replacement selected} other {replacements selected}}',
   },
+  numberOfReplacementsAvailable: {
+    message:
+      '{count, number, integer} {count, plural, one {replacement question available} other {replacement questions available}}',
+  },
   numberOfQuestionsReplaced: {
     message:
       '{ count, number } { count, plural, one { question successfully replaced } other { questions successfully replaced }} ',
   },
   numberOfQuestionsSelected: {
-    message: '{count, number} {count, plural, one {question selected} other {questions selected}}',
-  },
-  numberOfResourcesSelected: {
-    message: '{count, number} {count, plural, one {resource selected} other {resources selected}}',
-  },
-  selectedQuestionsInformation: {
-    message:
-      '{count, number, integer} of {total, number, integer} {total, plural, one {question selected} other {questions selected}}',
-  },
-  selectMoreQuestion: {
-    message:
-      'Select { count } more { count, plural , one { question } other { questions }} to continue',
+    message: 'Current number of questions in this section: {count, number}',
   },
-  selectFewerQuestion: {
-    message:
-      'Select { count } fewer { count, plural ,one { question } other { questions }} to continue',
+  selectQuestionsToContinue: {
+    message: 'Select { count } { count, plural , one { question } other { questions }} to continue',
   },
   selectQuiz: {
     message: 'Select quiz',
@@ -215,68 +176,33 @@ export const enhancedQuizManagementStrings = createTranslator('EnhancedQuizManag
       "Practice quizzes are pre-made quizzes, that don't require the curation work on the part of the coach. Selecting a practice quiz refers to importing a ready-to-use quiz.",
   },
   cannotSelectSomeTopicWarning: {
-    message:
-      'You can only select folders with { count, number } or less exercises and no subfolders to avoid oversized quizzes.',
+    message: 'You can only select a total of { count, number } questions or fewer.',
   },
   changesSavedSuccessfully: {
     message: 'Changes saved successfully',
     context: 'A snackbar message that appears when the user saves their changes',
   },
   sectionDeletedNotification: {
-    message: "Section '{ section_title }' deleted",
+    message: "'{ section_title }' deleted",
     context: 'A snackbar message that appears when the user deletes a section',
   },
   questionsDeletedNotification: {
     message: '{ count, number } { count, plural, one { question } other { questions }} deleted',
     context: 'A snackbar message that appears when the user deletes questions',
   },
-  updateResources: {
-    message: 'Update resources',
-  },
   allSectionsEmptyWarning: {
     message: "You don't have any questions in the quiz",
   },
-  notEnoughReplacementsTitle: {
-    message: 'Not enough replacements available',
-    context:
-      'Title of modal when a user tries to replace more questions than are available in the pool',
-  },
-  noReplacementsMessage: {
-    message:
-      'There are no more similar questions available to replace the selected questions with.',
-  },
-  notEnoughReplacementsMessage: {
-    message:
-      "You've selected { selected, number } { selected, plural, one { question } other { questions } } to replace, but {available, plural, =0 { don't have questions } one { only have 1 question } other { only have { available } questions } } available to replace them with.",
-    context:
-      'Message of modal when a user tries to replace more questions than are available in the pool',
-  },
-  addMoreQuestionsWithEmptyPool: {
-    message: 'You can add more questions, or delete existing questions.',
-    context: 'Message of modal when a user tries to replace questions but the pool is empty',
-  },
-  addMoreQuestionsWithNonEmptyPool: {
-    message:
-      'You can add more questions, delete existing questions, or go back and select fewer questions',
-    context:
-      'Message of modal when a user tries to replace more questions than are available in the pool',
-  },
-  addResourcesAction: {
-    message: 'Add resources',
-  },
-  goBackAction: {
-    message: 'Go back',
-  },
   questionsUnusedInSection: {
     message: '{ count, number } { count, plural, one { question } other { questions }} unused',
   },
   questionsFromResources: {
     message:
-      '{ questions, number } { questions, plural, one { question } other { questions }} in { resources, number } { resources, plural, one { resource } other { resources }}',
+      '{ questions, number } { questions, plural, one { question } other { questions }} selected',
   },
   questionsLabel: {
     message: 'Questions',
-    context: 'Label for dropdown list of questions',
+    context: 'Label for a list of questions',
   },
   jumpToQuestion: {
     message: 'Jump to question',
@@ -285,10 +211,6 @@ export const enhancedQuizManagementStrings = createTranslator('EnhancedQuizManag
   saveAndClose: {
     message: 'Save and close',
   },
-  questionDeletionConfirmation: {
-    message:
-      'Are you sure you want to remove { count, number } { count, plural, one { question } other { questions }} from this section?',
-  },
 });
 
 const { sectionLabel$ } = enhancedQuizManagementStrings;