diff --git a/src/components/AppHeader.vue b/src/components/AppHeader.vue
index fa9484c..3d4e44a 100644
--- a/src/components/AppHeader.vue
+++ b/src/components/AppHeader.vue
@@ -17,6 +17,10 @@
   margin-bottom: 0rem;
 }
 
+.app-header-link {
+  margin-right: 2.5rem;
+}
+
 .logo {
   height: 100%;
   width: auto;
diff --git a/src/components/CheckboxCompnent.vue b/src/components/CheckboxCompnent.vue
index f7be416..909130d 100644
--- a/src/components/CheckboxCompnent.vue
+++ b/src/components/CheckboxCompnent.vue
@@ -10,6 +10,7 @@ const props = defineProps<{
   selectAll?: () => void;
   isDisabled?: boolean;
   isCapitalized?: boolean;
+  isIndeterminate?: boolean;
 }>();
 
 const emit = defineEmits(['update:modelValue', 'selectAll']);
@@ -39,7 +40,7 @@ const model = computed({
       :checked="checked"
       :disabled="isDisabled"
     />
-    <span class="checkmark"></span>
+    <span class="checkmark" :class="{ indeterminate: isIndeterminate }"></span>
   </label>
 </template>
 <style scoped>
@@ -91,12 +92,12 @@ const model = computed({
 /* Create a custom checkbox */
 .checkmark {
   position: absolute;
-  top: 0.25rem;
+  top: 0.3125rem;
   left: 0;
-  height: 1rem;
-  width: 1rem;
+  height: 0.875rem;
+  width: 0.875rem;
   background-color: var(--neutral-0);
-  outline: 0.125rem solid var(--neutral-50);
+  outline: 0.1rem solid var(--neutral-50);
   border-radius: 0.125rem;
 }
 
@@ -122,12 +123,19 @@ const model = computed({
   display: block;
 }
 
+/* Partial selection (e.g. "select all" with only some items ticked): show a dash */
+.container .checkmark.indeterminate:after {
+  display: block;
+  top: 0.375rem;
+  height: 0.125rem;
+}
+
 /* Style the checkmark/indicator */
 .container .checkmark:after {
-  left: 0.25rem;
-  top: 0.25rem;
-  width: 0.5rem;
-  height: 0.5rem;
+  left: 0.21875rem;
+  top: 0.21875rem;
+  width: 0.4375rem;
+  height: 0.4375rem;
   background-color: var(--primary);
 }
 </style>
diff --git a/src/components/FiltersComponent.vue b/src/components/FiltersComponent.vue
index 3973939..69a2307 100644
--- a/src/components/FiltersComponent.vue
+++ b/src/components/FiltersComponent.vue
@@ -15,29 +15,8 @@ const props = defineProps<{
 }>();
 
 const sourcesStore = useSourcesStore();
-const availableSources = ref(sourcesStore.sourcesList);
 const { shouldClose } = toRefs(props);
 
-const handleSearchFilters = (event: Event) => {
-  if (!(event.target instanceof HTMLInputElement))
-    availableSources.value = sourcesStore.sourcesList;
-  const target = event.target as HTMLInputElement;
-  const value = target.value;
-  let temp = undefined;
-
-  for (const [category, sources] of Object.entries(sourcesStore.sourcesList)) {
-    const filteredSources = sources.filter((source) =>
-      source.name.toLowerCase().includes(value.toLowerCase())
-    );
-    if (filteredSources.length > 0) {
-      temp = temp || {};
-      temp[category] = filteredSources;
-    }
-  }
-
-  availableSources.value = temp || sourcesStore.sourcesList;
-};
-
 const hideFilters = ref(false);
 watch(shouldClose, (close) => {
   if (close) {
@@ -45,10 +24,6 @@ watch(shouldClose, (close) => {
   }
 });
 
-watch(sourcesStore, () => {
-  availableSources.value = sourcesStore.sourcesList;
-});
-
 const filters = useFiltersStore();
 const toggleFilters = () => (hideFilters.value = !hideFilters.value);
 
@@ -70,22 +45,6 @@ const clearFilters = () => {
   </div>
   <div v-if="filters.hasFilters" class="is-flex">
     <div class="is-flex is-flex-direction-column">
-      <div class="is-flex flex-wrap selection mb-1" v-if="filters.languageFilters.length">
-        <p>{{ $t('languages') }}{{ $t(':') }}</p>
-        <GenericPillComponent
-          class="mx-1"
-          bgColor="primary"
-          :key="filter"
-          v-for="filter in filters.languageFilters"
-          :content="$t(`lang.${filter}`, `${filter}`)"
-        >
-          <template #actions>
-            <span class="is-clickable" @click="filters.handleLanguageFilterChange(filter)">
-              x
-            </span>
-          </template>
-        </GenericPillComponent>
-      </div>
       <div class="is-flex flex-wrap selection mb-1" v-if="filters.sourcesFilters.length">
         <p>{{ $t('sources') }}{{ $t(':') }}</p>
         <GenericPillComponent
@@ -114,6 +73,22 @@ const clearFilters = () => {
           </template>
         </GenericPillComponent>
       </div>
+      <div class="is-flex flex-wrap selection mb-1" v-if="filters.languageFilters.length">
+        <p>{{ $t('languages') }}{{ $t(':') }}</p>
+        <GenericPillComponent
+          class="mx-1"
+          bgColor="primary"
+          :key="filter"
+          v-for="filter in filters.languageFilters"
+          :content="$t(`lang.${filter}`, `${filter}`)"
+        >
+          <template #actions>
+            <span class="is-clickable" @click="filters.handleLanguageFilterChange(filter)">
+              x
+            </span>
+          </template>
+        </GenericPillComponent>
+      </div>
     </div>
     <p class="ml-auto mr-6 remove-all" @click="clearFilters">{{ $t('removeAll') }}</p>
   </div>
@@ -121,29 +96,22 @@ const clearFilters = () => {
     <span class="has-text-grey">{{ $t('noFiltersSelected') }}</span>
   </p>
   <div :class="{ hide: hideFilters }" class="pr-5 filters">
-    <input
-      class="input"
-      type="text"
-      :placeholder="$t('searchBarPlaceholder')"
-      @keyup="handleSearchFilters"
-    />
-
     <details class="filter-section" open>
-      <summary>{{ $t('languages') }}</summary>
+      <summary>{{ $t('sources') }}</summary>
       <div class="filter-options">
-        <LanguagesSelector :availableLanguages="filters.languageList" />
+        <SourcesSelector :availableSources="sourcesStore.sourcesList || {}" />
       </div>
     </details>
     <details class="filter-section" open>
-      <summary>{{ $t('sources') }}</summary>
+      <summary>{{ $t('sdgsAcronym') }}</summary>
       <div class="filter-options">
-        <SourcesSelector :availableSources="availableSources" />
+        <SDGSelector />
       </div>
     </details>
     <details class="filter-section" open>
-      <summary>{{ $t('sdgsAcronym') }}</summary>
+      <summary>{{ $t('languages') }}</summary>
       <div class="filter-options">
-        <SDGSelector />
+        <LanguagesSelector :availableLanguages="filters.languageList" />
       </div>
     </details>
   </div>
diff --git a/src/components/FooterComponent.vue b/src/components/FooterComponent.vue
index 74a8af5..48b660c 100644
--- a/src/components/FooterComponent.vue
+++ b/src/components/FooterComponent.vue
@@ -1,5 +1,8 @@
 <script setup lang="ts">
 import { WL_FEEDBACK_FORM_URL } from '@/utils/constants';
+import { useFeatureFlipStore } from '@/stores/featureFlip';
+
+const featureFlip = useFeatureFlipStore();
 </script>
 
 <template>
@@ -9,6 +12,9 @@ import { WL_FEEDBACK_FORM_URL } from '@/utils/constants';
     </div>
     <div>
       <a target="_blank" :href="WL_FEEDBACK_FORM_URL">{{ $t('giveFeedback') }}</a>
+      <router-link v-if="featureFlip.isFeatureEnabled('about')" class="about" to="/about">
+        <span class="item-name">{{ $t('nav.about') }}</span>
+      </router-link>
       <router-link class="terms" to="/terms">
         <span class="item-name">{{ $t('terms') }}</span>
       </router-link>
@@ -31,7 +37,8 @@ a {
   cursor: pointer;
 }
 
-a:first-child {
+a:first-child,
+.about {
   margin-right: 1rem;
   padding-right: 1rem;
   border-right: 1px solid var(--neutral-70);
@@ -48,7 +55,8 @@ a:hover {
     font-size: 0.8rem;
   }
 
-  a:first-child {
+  a:first-child,
+  .about {
     margin-right: 0.5rem;
     padding-right: 0.5rem;
   }
diff --git a/src/components/__tests__/__snapshots__/QandA.spec.ts.snap b/src/components/__tests__/__snapshots__/QandA.spec.ts.snap
index e62cc25..8d41cbc 100644
--- a/src/components/__tests__/__snapshots__/QandA.spec.ts.snap
+++ b/src/components/__tests__/__snapshots__/QandA.spec.ts.snap
@@ -271,99 +271,6 @@ exports[`QandA > renders properly 1`] = `
       class="pr-5 filters"
       data-v-e843c1dd=""
     >
-      <input
-        class="input"
-        data-v-e843c1dd=""
-        placeholder="searchBarPlaceholder"
-        type="text"
-      />
-      <details
-        class="filter-section"
-        data-v-e843c1dd=""
-        open=""
-      >
-        <summary
-          data-v-e843c1dd=""
-        >
-          languages
-        </summary>
-        <div
-          class="filter-options"
-          data-v-e843c1dd=""
-        >
-          <div
-            class="is-flex"
-            data-v-e843c1dd=""
-          >
-            
-            <div
-              class="mx-2 mt-2"
-            >
-              <label
-                aria-label="en"
-                class="container"
-                data-v-7932c334=""
-              >
-                <div
-                  class="checkbox-label"
-                  data-v-7932c334=""
-                >
-                  <p
-                    data-v-7932c334=""
-                  >
-                    lang.en
-                  </p>
-                  
-                  
-                </div>
-                <input
-                  data-v-7932c334=""
-                  id="en"
-                  type="checkbox"
-                  value="en"
-                />
-                <span
-                  class="checkmark"
-                  data-v-7932c334=""
-                />
-              </label>
-            </div>
-            <div
-              class="mx-2 mt-2"
-            >
-              <label
-                aria-label="fr"
-                class="container"
-                data-v-7932c334=""
-              >
-                <div
-                  class="checkbox-label"
-                  data-v-7932c334=""
-                >
-                  <p
-                    data-v-7932c334=""
-                  >
-                    lang.fr
-                  </p>
-                  
-                  
-                </div>
-                <input
-                  data-v-7932c334=""
-                  id="fr"
-                  type="checkbox"
-                  value="fr"
-                />
-                <span
-                  class="checkmark"
-                  data-v-7932c334=""
-                />
-              </label>
-            </div>
-            
-          </div>
-        </div>
-      </details>
       <details
         class="filter-section"
         data-v-e843c1dd=""
@@ -944,6 +851,93 @@ exports[`QandA > renders properly 1`] = `
           
         </div>
       </details>
+      <details
+        class="filter-section"
+        data-v-e843c1dd=""
+        open=""
+      >
+        <summary
+          data-v-e843c1dd=""
+        >
+          languages
+        </summary>
+        <div
+          class="filter-options"
+          data-v-e843c1dd=""
+        >
+          <div
+            class="is-flex"
+            data-v-e843c1dd=""
+          >
+            
+            <div
+              class="mx-2 mt-2"
+            >
+              <label
+                aria-label="en"
+                class="container"
+                data-v-7932c334=""
+              >
+                <div
+                  class="checkbox-label"
+                  data-v-7932c334=""
+                >
+                  <p
+                    data-v-7932c334=""
+                  >
+                    lang.en
+                  </p>
+                  
+                  
+                </div>
+                <input
+                  data-v-7932c334=""
+                  id="en"
+                  type="checkbox"
+                  value="en"
+                />
+                <span
+                  class="checkmark"
+                  data-v-7932c334=""
+                />
+              </label>
+            </div>
+            <div
+              class="mx-2 mt-2"
+            >
+              <label
+                aria-label="fr"
+                class="container"
+                data-v-7932c334=""
+              >
+                <div
+                  class="checkbox-label"
+                  data-v-7932c334=""
+                >
+                  <p
+                    data-v-7932c334=""
+                  >
+                    lang.fr
+                  </p>
+                  
+                  
+                </div>
+                <input
+                  data-v-7932c334=""
+                  id="fr"
+                  type="checkbox"
+                  value="fr"
+                />
+                <span
+                  class="checkmark"
+                  data-v-7932c334=""
+                />
+              </label>
+            </div>
+            
+          </div>
+        </div>
+      </details>
     </div>
     
     <!--v-if-->
diff --git a/src/components/dropdowns/SourcesSelector.vue b/src/components/dropdowns/SourcesSelector.vue
index 4c85956..c012393 100644
--- a/src/components/dropdowns/SourcesSelector.vue
+++ b/src/components/dropdowns/SourcesSelector.vue
@@ -1,18 +1,53 @@
 <script setup lang="ts">
 import CheckboxCompnentVue from '@/components/CheckboxCompnent.vue';
+import ChevronDownIcon from '@/components/icons/ChevronDown.vue';
+import ChevronUpIcon from '@/components/icons/ChevronUp.vue';
 import { useFiltersStore } from '@/stores/filters';
 import type { Corpus } from '@/types';
+import { ref } from 'vue';
 
 defineProps<{ isUp?: boolean; context?: string; availableSources: Record<string, Corpus[]> }>();
 const filters = useFiltersStore();
+
+const names = (sources: Corpus[]) => sources.map((source) => source.name);
+const selectedCount = (sources: Corpus[]) =>
+  sources.filter((source) => filters.sourcesFilters.includes(source.name)).length;
+
+// categories are open by default; the chevron folds them (ticking the category never does)
+const folded = ref<Record<string, boolean>>({});
 </script>
 <template>
-  <div v-for="(sources, category) in availableSources" :key="category">
-    <details open>
-      <summary :data-category="category" class="font-bold is-clickable">
-        {{ $t(`categories.${category}`) }}
-      </summary>
+  <div v-for="(sources, category) in availableSources" :key="category" class="category">
+    <!-- data-category: same highlight colour as the matching result cards -->
+    <div class="category-row" :data-category="category">
+      <CheckboxCompnentVue
+        class="category-checkbox"
+        :name="`all-${category}`"
+        :id="`all-${category}`"
+        :value="`${category}`"
+        :modelValue="selectedCount(sources) === sources.length ? [`${category}`] : []"
+        label=""
+        :checked="selectedCount(sources) === sources.length"
+        :isIndeterminate="selectedCount(sources) > 0 && selectedCount(sources) < sources.length"
+        @selectAll="filters.toggleCategorySources(names(sources))"
+      >
+        <template #test>
+          <span class="category-name">{{ $t(`categories.${category}`) }}</span>
+        </template>
+      </CheckboxCompnentVue>
+      <span class="count">{{ selectedCount(sources) }}/{{ sources.length }}</span>
+      <button
+        class="fold"
+        :aria-expanded="!folded[category]"
+        :aria-label="$t(`categories.${category}`)"
+        @click="folded[category] = !folded[category]"
+      >
+        <ChevronDownIcon v-if="folded[category]" />
+        <ChevronUpIcon v-else />
+      </button>
+    </div>
 
+    <div v-show="!folded[category]" class="category-sources">
       <div v-for="source in sources" :key="source.name">
         <CheckboxCompnentVue
           :name="source.name"
@@ -25,17 +60,62 @@ const filters = useFiltersStore();
         >
         </CheckboxCompnentVue>
       </div>
-    </details>
+    </div>
   </div>
 </template>
 
 <style scoped>
-summary {
+.category {
   margin-top: 0.5rem;
+}
+
+.category-row {
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+  padding: 0.25rem 0.5rem;
+  border-radius: 0.25rem;
+}
+
+.category-checkbox {
+  flex: 1;
+  min-width: 0;
+  /* the label text lives in the slot, drop the empty default label */
+  :deep(.checkbox-label > p:empty) {
+    display: none;
+  }
+}
 
+/* tighter gap so the category name lines up with its sources' checkboxes */
+.category-row .category-checkbox {
+  padding-left: 1.25rem;
+}
+
+.category-name {
+  font-weight: bold;
+}
+
+.count {
+  font-size: 0.8rem;
+  font-variant-numeric: tabular-nums;
+}
+
+.fold {
+  all: unset;
+  display: flex;
+  width: 1.5rem;
+  height: 1.5rem;
   cursor: pointer;
-  padding: 0.2rem;
   border-radius: 0.25rem;
-  position: sticky;
+  &:hover {
+    background-color: rgb(0 0 0 / 8%);
+  }
+  &:focus-visible {
+    outline: 2px solid var(--primary);
+  }
+}
+
+.category-sources {
+  padding-left: 2.25rem;
 }
 </style>
diff --git a/src/components/nav/BaseNavItem.vue b/src/components/nav/BaseNavItem.vue
index ce44926..a2a0ef5 100644
--- a/src/components/nav/BaseNavItem.vue
+++ b/src/components/nav/BaseNavItem.vue
@@ -60,6 +60,14 @@ defineProps<{
   background-color: var(--neutral-20);
 }
 
+.icon {
+  width: 1.5rem;
+  height: 1.5rem;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
 .item-name {
   width: auto;
   white-space: nowrap;
diff --git a/src/components/nav/HelpComponent.vue b/src/components/nav/HelpComponent.vue
index 5a7c5b6..404cb14 100644
--- a/src/components/nav/HelpComponent.vue
+++ b/src/components/nav/HelpComponent.vue
@@ -22,7 +22,8 @@ watch(
   () => route.path.split('/')[1],
   async (path) => {
     instructions.value = HELP_USER[path as HelpUserKey] || [];
-  }
+  },
+  { immediate: true }
 );
 </script>
 <template>
diff --git a/src/components/nav/LanguageSelector.vue b/src/components/nav/LanguageSelector.vue
index d8aefac..33778ca 100644
--- a/src/components/nav/LanguageSelector.vue
+++ b/src/components/nav/LanguageSelector.vue
@@ -22,12 +22,11 @@ const storeLanguage = (e: Event) => {
 <style scoped>
 .language-selector {
   all: unset;
-  flex-direction: row;
-  justify-self: flex-end;
-  margin-top: auto;
-  font-size: 0.75rem;
-  margin-left: auto;
+  display: flex;
+  align-items: center;
   margin-right: 1rem;
+  padding-top: 0.5rem;
+  padding-bottom: 0.25rem;
 }
 
 select,
@@ -36,12 +35,12 @@ select,
 }
 
 select {
-  border: 2px solid var(--neutral-0);
-
-  padding: 10px;
+  border: none;
+  border-radius: 4px;
+  padding: 0.25rem 0.75rem;
   transition: 0.4s;
-  margin-bottom: 0.5rem;
-  font-size: 0.8rem;
+  font-size: 0.9rem;
+  cursor: pointer;
 }
 
 select:hover {
diff --git a/src/components/nav/NavComponent.vue b/src/components/nav/NavComponent.vue
index 6f7ab53..8028c0c 100644
--- a/src/components/nav/NavComponent.vue
+++ b/src/components/nav/NavComponent.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import SearchIcon from '@/components/icons/SearchIcon.vue';
-import AboutIcon from '@/components/icons/AboutIcon.vue';
 import LinesLeaningIcon from '@/components/icons/LinesLeaningIcon.vue';
 import QnAIcon from '@/components/icons/QnAIcon.vue';
 import HelpComponent from '@/components/nav/HelpComponent.vue';
@@ -13,7 +12,8 @@ import LanguageSelector from './LanguageSelector.vue';
 
 const featureFlip = useFeatureFlipStore();
 
-const navEntries = [
+// Features (tools) on the left; personal/utility items on the right. About lives in the footer.
+const toolEntries = [
   {
     name: 'chat',
     to: '/q-and-a',
@@ -24,52 +24,57 @@ const navEntries = [
     name: 'syllabus',
     to: '/tutor',
     icon: BookIcon,
-    featureFlag: 'tutor',
     isFeatureEnabled: featureFlip.isFeatureEnabled('tutor')
   },
-
+  {
+    name: 'microlearning',
+    to: '/microlearning',
+    icon: LinesLeaningIcon,
+    isFeatureEnabled: featureFlip.isFeatureEnabled('microlearning')
+  },
   {
     name: 'search',
     to: '/search',
     icon: SearchIcon,
     isFeatureEnabled: featureFlip.isFeatureEnabled('search')
-  },
+  }
+];
+
+const utilityEntries = [
   {
     name: 'bookmarks',
     to: '/bookmarks',
     icon: NavBookmarkIcon,
     isFeatureEnabled: featureFlip.isFeatureEnabled('bookmarks')
-  },
-  {
-    name: 'microlearning',
-    to: '/microlearning',
-    icon: LinesLeaningIcon,
-    featureFlag: 'microlearning',
-    isFeatureEnabled: featureFlip.isFeatureEnabled('microlearning')
-  },
-  {
-    name: 'about',
-    to: '/about',
-    icon: AboutIcon,
-    isFeatureEnabled: featureFlip.isFeatureEnabled('about')
   }
 ];
 </script>
 <template>
   <div class="nav">
     <div class="nav-items">
-      <div v-for="entry in navEntries" :key="entry.name">
+      <template v-for="entry in toolEntries" :key="entry.name">
         <BaseNavItem
           v-if="entry.isFeatureEnabled"
           :to="entry.to"
           :name="entry.name"
           :icon="entry.icon"
         />
-      </div>
+      </template>
+
+      <div class="utilities">
+        <template v-for="entry in utilityEntries" :key="entry.name">
+          <BaseNavItem
+            v-if="entry.isFeatureEnabled"
+            :to="entry.to"
+            :name="entry.name"
+            :icon="entry.icon"
+          />
+        </template>
 
-      <HelpComponent />
+        <HelpComponent />
 
-      <LanguageSelector />
+        <LanguageSelector />
+      </div>
     </div>
   </div>
 </template>
@@ -98,6 +103,14 @@ const navEntries = [
   }
 }
 
+.utilities {
+  margin-left: auto;
+  padding-left: 0.5rem;
+  border-left: 1px solid var(--neutral-20);
+  align-items: center;
+  gap: 0.25rem;
+}
+
 .router-link-form {
   all: unset;
   display: flex;
diff --git a/src/components/tutor/ThirdStep.vue b/src/components/tutor/ThirdStep.vue
index e4db95c..1572e15 100644
--- a/src/components/tutor/ThirdStep.vue
+++ b/src/components/tutor/ThirdStep.vue
@@ -5,7 +5,8 @@ import { ref, type Ref } from 'vue';
 import EditIcon from '@/components/icons/EditIcon.vue';
 const props = defineProps<{
   syllabus?: { content: string; source: string };
-  giveFeedback: (feedback: string) => void;
+  giveFeedback: (feedback: string) => Promise<boolean>;
+  feedbackHistory: string[];
   action: () => {};
   actionText?: string;
   disabled: boolean;
@@ -21,7 +22,8 @@ const feedback: Ref<string> = ref('');
 
 const toggleFeedback = async () => {
   if (feedback.value.length > 0) {
-    await props.giveFeedback(feedback.value);
+    // keep the text if sending failed, so the user doesn't lose what they wrote
+    if (!(await props.giveFeedback(feedback.value))) return;
     feedback.value = '';
   }
   enableFeedback.value = !enableFeedback.value;
@@ -69,6 +71,13 @@ const handleSyllabusEdition = () => {
       </div>
     </div>
 
+    <details v-if="feedbackHistory.length" class="feedback-history" open>
+      <summary>{{ $t('tutor.thirdStep.feedbackHistory', { n: feedbackHistory.length }) }}</summary>
+      <ol>
+        <li v-for="(item, index) in feedbackHistory" :key="index">{{ item }}</li>
+      </ol>
+    </details>
+
     <textarea class="textarea" v-if="enableFeedback" v-model="feedback"></textarea>
 
     <div class="actions">
@@ -98,6 +107,25 @@ const handleSyllabusEdition = () => {
   margin-right: auto;
 }
 
+.feedback-history {
+  margin-bottom: 1rem;
+  padding: 0.75rem 1rem;
+  border: 1px solid var(--neutral-20);
+  border-radius: 0.5rem;
+  background-color: var(--neutral-10);
+  summary {
+    cursor: pointer;
+    font-weight: bold;
+  }
+  ol {
+    margin: 0.5rem 0 0 1.5rem;
+  }
+  li {
+    white-space: pre-wrap;
+    margin-bottom: 0.25rem;
+  }
+}
+
 .button > svg {
   height: 1rem;
   padding-right: 1rem;
diff --git a/src/localisation/en.ts b/src/localisation/en.ts
index 39dcf99..4069a82 100644
--- a/src/localisation/en.ts
+++ b/src/localisation/en.ts
@@ -292,7 +292,6 @@ export const en = {
   removeAll: 'Clear all',
   removeBookmark: 'Remove bookmark',
   removeSelection: 'Clear',
-  searchBarPlaceholder: 'Search...',
   sdgsAcronym: 'SDGs',
   sdgs: {
     1: 'No Poverty',
@@ -438,7 +437,8 @@ export const en = {
       description:
         'You can edit directly on this page, download a copy, and submit feedback that WeLearn will use to regenerate the syllabus — in any order, and as many times as you like.',
       giveFeedback: 'Provide feedback on the generated syllabus',
-      sendFeedback: 'Submit feedback'
+      sendFeedback: 'Submit feedback',
+      feedbackHistory: 'Changes you already requested ({n})'
     }
   },
   microlearning: {
diff --git a/src/localisation/fr.ts b/src/localisation/fr.ts
index 29807da..d5e8ded 100644
--- a/src/localisation/fr.ts
+++ b/src/localisation/fr.ts
@@ -294,7 +294,6 @@ export const fr = {
   removeAll: 'Tout effacer',
   removeBookmark: 'Retirer des favoris',
   removeSelection: 'Effacer',
-  searchBarPlaceholder: 'Rechercher...',
   sdgsAcronym: 'ODD',
   sdgs: {
     1: 'Pas de pauvreté',
@@ -443,7 +442,8 @@ export const fr = {
       description:
         'Vous pouvez modifier directement cette page, télécharger une copie et envoyer un retour que WeLearn utilisera pour régénérer le syllabus — dans l’ordre de votre choix, autant de fois que nécessaire.',
       giveFeedback: 'Donner un retour sur le syllabus généré',
-      sendFeedback: 'Envoyer le retour'
+      sendFeedback: 'Envoyer le retour',
+      feedbackHistory: 'Modifications déjà demandées ({n})'
     }
   },
   microlearning: {
diff --git a/src/stores/filters.ts b/src/stores/filters.ts
index 322ee61..e238b18 100644
--- a/src/stores/filters.ts
+++ b/src/stores/filters.ts
@@ -45,6 +45,15 @@ export const useFiltersStore = defineStore('filters', () => {
     }
   };
 
+  // "Select all" for one category: untick all if every source is ticked, otherwise tick the missing ones
+  const toggleCategorySources = (names: Corpus['name'][]) => {
+    if (names.every((name) => sourcesFilters.value.includes(name))) {
+      sourcesFilters.value = sourcesFilters.value.filter((item) => !names.includes(item));
+    } else {
+      sourcesFilters.value = [...new Set([...sourcesFilters.value, ...names])];
+    }
+  };
+
   const handleResetFilters = () => {
     sdgFilters.value = [];
     sourcesFilters.value = [];
@@ -58,6 +67,7 @@ export const useFiltersStore = defineStore('filters', () => {
     sourcesFilters,
     handleSdgFilterChange,
     handleSourcesFilterChange,
+    toggleCategorySources,
     handleLanguageFilterChange,
     languageList,
     languageFilters,
diff --git a/src/stores/tutor.ts b/src/stores/tutor.ts
index dd9ac67..14201ce 100644
--- a/src/stores/tutor.ts
+++ b/src/stores/tutor.ts
@@ -21,6 +21,8 @@ export const useTutorStore = defineStore('tutor', () => {
   const courseTitle: Ref<string> = ref('');
   const selectedSources: Ref<Document[]> = ref([]);
   const extracts: Ref<string[]> = ref([]);
+  // feedback the user already sent for the current syllabus, oldest first
+  const feedbackHistory: Ref<string[]> = ref([]);
 
   const goBack = () => (step.value = step.value - 1);
   const goNext = () => (step.value = step.value + 1);
@@ -245,6 +247,7 @@ export const useTutorStore = defineStore('tutor', () => {
     newFilesToSearch.value = {};
     searchedFiles.value = [];
     extracts.value = [];
+    feedbackHistory.value = [];
   };
 
   const retrieveSyllabus = async () => {
@@ -297,7 +300,7 @@ export const useTutorStore = defineStore('tutor', () => {
     goNext();
   };
 
-  const giveFeedback = async (feedback: string) => {
+  const giveFeedback = async (feedback: string): Promise<boolean> => {
     if (!tutorSearch.value || !syllabi.value) {
       throw new Error('Body is empty');
     }
@@ -313,8 +316,11 @@ export const useTutorStore = defineStore('tutor', () => {
       });
 
       syllabi.value = resp.data.syllabus[0];
+      feedbackHistory.value.push(feedback);
+      return true;
     } catch (error) {
       console.error('Error during feedback submission:', error);
+      return false;
     } finally {
       isLoading.value = false;
     }
@@ -374,6 +380,7 @@ export const useTutorStore = defineStore('tutor', () => {
     isLoading,
     searchedFiles,
     giveFeedback,
+    feedbackHistory,
     handleDownloadSyllabus,
     courseTitle,
     selectedSources,
diff --git a/src/views/SearchSDG.vue b/src/views/SearchSDG.vue
index 00aad62..05b4d80 100644
--- a/src/views/SearchSDG.vue
+++ b/src/views/SearchSDG.vue
@@ -10,14 +10,49 @@ import Pill from '@/components/PillComponent.vue';
 import FiltersComponent from '@/components/FiltersComponent.vue';
 import ColumnTemplate from '@/components/ColumnTemplate.vue';
 
+import ChevronDownIcon from '@/components/icons/ChevronDown.vue';
+import { nextTick, ref } from 'vue';
+
 const store = useSearchStore();
+
+// The search box collapses into a one-line bar while the user scrolls down through the results,
+// and comes back when they click it or scroll back to the top.
+// Only the results area scrolls, so collapsing never moves the scroll position (no flicker loop).
+const wrapper = ref<HTMLElement | null>(null);
+const isCompact = ref(false);
+let lastScrollTop = 0;
+
+const onResultsScroll = (event: Event) => {
+  const top = (event.target as HTMLElement).scrollTop;
+  if (top === 0) isCompact.value = false;
+  else if (top > 24 && top > lastScrollTop) isCompact.value = true;
+  lastScrollTop = top;
+};
+
+const expandSearch = async () => {
+  isCompact.value = false;
+  await nextTick();
+  wrapper.value?.querySelector('textarea')?.focus();
+};
 </script>
 
 <template>
-  <ColumnTemplate>
+  <ColumnTemplate class="search-page">
     <template #left-panel>
-      <div class="wrapper">
-        <SearchWrapper>
+      <div class="wrapper" ref="wrapper">
+        <Transition name="fade">
+          <button
+            v-if="isCompact"
+            class="compact-bar"
+            :aria-label="$t('search')"
+            @click="expandSearch"
+          >
+            <SearchIcon size="1.25rem" />
+            <span class="compact-query">{{ store.searchInput }}</span>
+            <span class="compact-chevron"><ChevronDownIcon /></span>
+          </button>
+        </Transition>
+        <SearchWrapper v-show="!isCompact" class="search-box">
           <template #textArea>
             <div class="delete-button-wrapper" v-if="store.searchInput">
               <DeleteButton :action="store.$reset" :delText="$t('clearSearch')" />
@@ -59,21 +94,24 @@ const store = useSearchStore();
           </template>
         </SearchWrapper>
 
-        <SourcesListComponent
-          v-if="
-            store.searchResults ||
-            store.isFetchingSources ||
-            store.hasSourcesError ||
-            store.displayNoResult
-          "
-          hideRefIndicator
-          :sourcesList="store.searchResults || []"
-          :isSourcesError="store.hasSourcesError"
-          :isFetchingSources="store.isFetchingSources"
-          :shouldDisplayScore="store.shouldDisplayScore"
-          :errorCode="store.errorCode"
-          :noResults="store.displayNoResult"
-        />
+        <div class="results-scroll" @scroll="onResultsScroll">
+          <SourcesListComponent
+            class="results"
+            v-if="
+              store.searchResults ||
+              store.isFetchingSources ||
+              store.hasSourcesError ||
+              store.displayNoResult
+            "
+            hideRefIndicator
+            :sourcesList="store.searchResults || []"
+            :isSourcesError="store.hasSourcesError"
+            :isFetchingSources="store.isFetchingSources"
+            :shouldDisplayScore="store.shouldDisplayScore"
+            :errorCode="store.errorCode"
+            :noResults="store.displayNoResult"
+          />
+        </div>
       </div>
     </template>
     <template #right-panel>
@@ -83,12 +121,68 @@ const store = useSearchStore();
 </template>
 
 <style scoped>
+.search-box {
+  flex-shrink: 0;
+}
+
+.compact-bar {
+  all: unset;
+  box-sizing: border-box;
+  flex-shrink: 0;
+  display: flex;
+  align-items: center;
+  gap: 0.75rem;
+  width: 100%;
+  margin-bottom: 1rem;
+  padding: 0.75rem 1rem;
+  border: 1px solid var(--neutral-50);
+  border-radius: 0.5rem;
+  background-color: var(--neutral-0);
+  cursor: pointer;
+  &:hover {
+    background-color: var(--neutral-10);
+  }
+}
+
+.compact-chevron {
+  display: flex;
+  flex-shrink: 0;
+  width: 1.5rem;
+  height: 1.5rem;
+}
+
+.compact-query {
+  flex: 1;
+  min-width: 0;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.fade-enter-active {
+  transition: opacity 0.2s ease;
+}
+.fade-enter-from {
+  opacity: 0;
+}
+
+/* Only the results scroll, below the search box / compact bar */
+.results-scroll {
+  flex: 1;
+  min-height: 0;
+  overflow-y: auto;
+}
+
+.results {
+  overflow: visible;
+}
+
 .wrapper {
   position: relative;
   display: flex;
   flex-direction: column;
   height: 100%;
-  overflow-y: auto;
+  overflow: hidden;
   padding: 1rem 3rem 0rem 3rem;
 }
 
@@ -125,6 +219,14 @@ const store = useSearchStore();
   font-size: 14px;
 }
 
+/* Stacked layout (filters below): the search column fills the screen, filters are reached by scrolling the page */
+@media (max-width: 991px) {
+  .search-page :deep(.left) {
+    height: 100%;
+    flex-shrink: 0;
+  }
+}
+
 @media (max-width: 768px) {
   .text-length-feedback {
     font-size: 0.7em;
@@ -133,7 +235,6 @@ const store = useSearchStore();
   }
   .wrapper {
     padding: 0.25rem;
-    height: 100%;
   }
   .sdg-list-title {
     font-size: 0.875em;
diff --git a/src/views/TutorPage.vue b/src/views/TutorPage.vue
index 876b6da..ae50f78 100644
--- a/src/views/TutorPage.vue
+++ b/src/views/TutorPage.vue
@@ -114,6 +114,7 @@ onMounted(() => {
         :syllabus="store.syllabi"
         :updateSyllabus="store.updateSyllabus"
         :giveFeedback="store.giveFeedback"
+        :feedbackHistory="store.feedbackHistory"
         :action="stepToAction[4]"
         :restart="store.restart"
         :updateSyllabusInDB="store.updateSyllabusInDB"