diff --git a/e2e/selectBookmark.spec.ts b/e2e/selectBookmark.spec.ts
index 80bdb83..da7349d 100644
--- a/e2e/selectBookmark.spec.ts
+++ b/e2e/selectBookmark.spec.ts
@@ -5,6 +5,7 @@ test.describe('select bookmark', () => {
     await page.goto('/search');
 
     await page.fill('textarea', 'this is a longer text for testing');
+
     await page.getByLabel('Recherche', { exact: true }).click();
 
     await expect(page.getByText('Document one test')).toBeVisible();
diff --git a/src/components/AppHeader.vue b/src/components/AppHeader.vue
index 5969f8a..fa9484c 100644
--- a/src/components/AppHeader.vue
+++ b/src/components/AppHeader.vue
@@ -23,7 +23,7 @@
   max-height: clamp(24px, 5vw, 3.5em);
 }
 
-@media (max-width: 1600px) {
+@media (max-width: 1330px) {
   .app-header-link {
     display: none;
     & > * {
diff --git a/src/components/ChatArea.vue b/src/components/ChatArea.vue
index 0e60d2c..8cb5ca0 100644
--- a/src/components/ChatArea.vue
+++ b/src/components/ChatArea.vue
@@ -143,7 +143,7 @@ const handleOnWheel = () => {
 @media screen and (min-width: 768px) {
   .bottom-wrapper {
     width: 100%;
-    padding-bottom: 5rem;
+    padding-bottom: 1rem;
   }
   .scroll-arrow {
     all: unset;
diff --git a/src/components/ChatBuble.vue b/src/components/ChatBuble.vue
index c3a5029..d5949e7 100644
--- a/src/components/ChatBuble.vue
+++ b/src/components/ChatBuble.vue
@@ -113,6 +113,12 @@ const copyMessage = (msg: string) => {
   }
 }
 
+@media screen and (max-width: 1450px) {
+  .chat-bubble.last-message {
+    padding-bottom: 1rem;
+  }
+}
+
 @media screen and (max-width: 576px) {
   .chat-bubble-content {
     display: flex;
diff --git a/src/components/ChatComponent.vue b/src/components/ChatComponent.vue
index 4382297..20ec695 100644
--- a/src/components/ChatComponent.vue
+++ b/src/components/ChatComponent.vue
@@ -62,7 +62,7 @@ const computedStatus = computed(() => store.chatStatus);
           :action="(content: string) => store.onSendMessage(content)"
           class="queues-wrapper"
         >
-          <p v-if="CHAT_STATUS.DONE === computedStatus" class="subtitle is-6 ml-4">
+          <p v-if="CHAT_STATUS.DONE === computedStatus" class="subtitle is-6 ml-4 mb-2">
             {{ $t('hintForNewQuestions') }}
           </p>
 
diff --git a/src/components/ChatEmptyContent.vue b/src/components/ChatEmptyContent.vue
index 7fc571e..27e6a51 100644
--- a/src/components/ChatEmptyContent.vue
+++ b/src/components/ChatEmptyContent.vue
@@ -7,7 +7,7 @@ defineProps<{
 <template>
   <div class="chat-default">
     <div>{{ $t('emptyChatPresentation') }}</div>
-    <div class="mt-6">{{ $t('emptyChatAction') }}</div>
+    <div class="mt-3">{{ $t('emptyChatAction') }}</div>
   </div>
 </template>
 <style scoped>
@@ -26,6 +26,16 @@ defineProps<{
   text-align: left;
 }
 
+@media screen and (min-width: 1300) {
+  .chat-default {
+    text-align: center;
+    & > * {
+      text-align: center;
+      font-size: 0.5rem;
+    }
+  }
+}
+
 @media screen and (min-width: 576px) {
   .chat-default {
     text-align: center;
diff --git a/src/components/ChatQueuesPills.vue b/src/components/ChatQueuesPills.vue
index be57982..11e2a5a 100644
--- a/src/components/ChatQueuesPills.vue
+++ b/src/components/ChatQueuesPills.vue
@@ -61,7 +61,7 @@ defineProps<{
   background: var(--neutral-50);
 }
 
-@media screen and (max-width: 767px) {
+@media screen and (max-width: 1450px) {
   .card-content {
     padding: 0.5rem;
   }
diff --git a/src/components/SearchWrapper.vue b/src/components/SearchWrapper.vue
index e78db24..1c2d428 100644
--- a/src/components/SearchWrapper.vue
+++ b/src/components/SearchWrapper.vue
@@ -17,6 +17,22 @@
   margin-bottom: 1rem;
 }
 
+.text-area {
+  transition: all 0.5s ease;
+}
+
+.search-container:hover {
+  & > .text-area {
+    height: 19em;
+  }
+}
+
+.search-container:not(:hover) {
+  & > .text-area:has(.textarea:not([value=''])) {
+    height: 5em;
+  }
+}
+
 .filters {
   position: relative;
   display: flex;
diff --git a/src/components/SourcesListComponent.vue b/src/components/SourcesListComponent.vue
index 856ee60..a02d271 100644
--- a/src/components/SourcesListComponent.vue
+++ b/src/components/SourcesListComponent.vue
@@ -15,7 +15,7 @@ const store = useBookmarksStore();
 
 const props = defineProps<{
   hideSteps?: boolean;
-  sourcesList: Document[] | null;
+  sourcesList: Document[] | [];
   isSourcesError: boolean;
   isFetchingSources: boolean;
   fetchingAnswer?: boolean;
@@ -49,7 +49,6 @@ const ChosenCard = Cards[props.cardType || 'default'];
         }}
       </h2>
       <h2 v-else-if="fetchingAnswer">{{ $t('sourcesList.formulatingAnswer') }}</h2>
-      <h2 v-else>...</h2>
     </div>
     <!-- results -->
 
diff --git a/src/components/TextAreaComponent.vue b/src/components/TextAreaComponent.vue
index e7062d3..5bbdfc0 100644
--- a/src/components/TextAreaComponent.vue
+++ b/src/components/TextAreaComponent.vue
@@ -24,6 +24,7 @@ defineEmits(['update:modelValue']);
 <style scoped>
 .textarea {
   border: none;
+  height: 100%;
   padding: 2rem;
 }
 
diff --git a/src/components/__tests__/__snapshots__/QandA.spec.ts.snap b/src/components/__tests__/__snapshots__/QandA.spec.ts.snap
index a9d9120..e7b01d5 100644
--- a/src/components/__tests__/__snapshots__/QandA.spec.ts.snap
+++ b/src/components/__tests__/__snapshots__/QandA.spec.ts.snap
@@ -44,7 +44,7 @@ exports[`QandA > renders properly 1`] = `
               emptyChatPresentation
             </div>
             <div
-              class="mt-6"
+              class="mt-3"
               data-v-c98dfe8d=""
             >
               emptyChatAction
@@ -1001,7 +1001,23 @@ exports[`QandA > renders properly 1`] = `
     </div>
     
     <!--v-if-->
-    <!--v-if-->
+    <div
+      class="sources-list"
+      data-v-dbbc9003=""
+      data-v-eedbfc9b=""
+    >
+      <!-- fetching -->
+      <div
+        data-v-eedbfc9b=""
+      >
+        <!--v-if-->
+        <!--v-if-->
+      </div>
+      <!-- results -->
+      <!--v-if-->
+      <!-- error  -->
+      <!--v-if-->
+    </div>
     <!--v-if-->
     
   </div>
diff --git a/src/components/nav/BaseNavItem.vue b/src/components/nav/BaseNavItem.vue
index 1d7d26d..0346888 100644
--- a/src/components/nav/BaseNavItem.vue
+++ b/src/components/nav/BaseNavItem.vue
@@ -67,6 +67,20 @@ defineProps<{
 }
 
 @media screen and (max-width: 1450px) {
+  .link-wrapper {
+    padding-inline: 0.25rem;
+  }
+  router-link {
+    padding: 0.25rem 0.5rem;
+    display: flex;
+    font-size: 0.5rem;
+
+    gap: 0rem;
+    margin: 0 0.05rem;
+  }
+}
+
+@media screen and (max-width: 1100px) {
   .item-name {
     display: none;
     visibility: hidden;
@@ -74,9 +88,6 @@ defineProps<{
     width: 0rem;
     white-space: nowrap;
   }
-  .router-link {
-    gap: 0;
-  }
 }
 
 @media screen and (max-width: 750px) {
diff --git a/src/stores/chat.ts b/src/stores/chat.ts
index 6dec442..04b2857 100644
--- a/src/stores/chat.ts
+++ b/src/stores/chat.ts
@@ -28,7 +28,7 @@ export const useChatStore = defineStore('chat', () => {
   const chatInput: Ref<string> = ref('');
   const chatMessagesList: Ref<ChatMessage[]> = ref(getFromStorage('chat') || []);
   const questionQueues: Ref<string[] | null> = ref(getFromStorage('questionQueues'));
-  const sourcesList: Ref<Document[]> = ref(getFromStorage('chatSources') || []);
+  const sourcesList: Ref<Document[] | []> = ref(getFromStorage('chatSources') || []);
   const reformulatedQuery: Ref<string | null> = ref(getFromStorage('reformulatedQuery'));
   const storedThreadId: Ref<string | null> = ref(localStorage.getItem('chatThreadId'));
   const storedMessageId: Ref<string | null> = ref(localStorage.getItem('chatMessageId'));
diff --git a/src/utils/navigation.ts b/src/utils/navigation.ts
index 58ad80d..586df0b 100644
--- a/src/utils/navigation.ts
+++ b/src/utils/navigation.ts
@@ -1,3 +1,4 @@
 export const scrollToAnchor = (id: string) => {
+  if (!document.getElementById(id)) return;
   document.getElementById(id).scrollIntoView({ behavior: 'smooth' });
 };
diff --git a/src/views/QandA.vue b/src/views/QandA.vue
index b7a00d5..6d773e9 100644
--- a/src/views/QandA.vue
+++ b/src/views/QandA.vue
@@ -23,11 +23,14 @@ onBeforeMount(() => {
       <FiltersComponent :shouldClose="computedStatus === CHAT_STATUS.FORMULATING_ANSWER" />
       <ReformulatedQuery v-if="chatstore.reformulatedQuery" :query="chatstore.reformulatedQuery" />
       <SourcesListComponentVue
-        v-if="chatstore.sourcesList.length"
         cardType="simple"
         :shouldDisplayScore="!!chatstore.shouldDisplayScore"
         :sourcesList="
-          [CHAT_STATUS.DONE, CHAT_STATUS.FORMULATING_ANSWER].includes(computedStatus)
+          [
+            CHAT_STATUS.DONE,
+            CHAT_STATUS.FORMULATING_ANSWER,
+            CHAT_STATUS.FORMULATED_ANSWER
+          ].includes(computedStatus)
             ? chatstore.sourcesList.slice(0, 7)
             : []
         "
diff --git a/src/views/SearchSDG.vue b/src/views/SearchSDG.vue
index 214968c..1cc12cf 100644
--- a/src/views/SearchSDG.vue
+++ b/src/views/SearchSDG.vue
@@ -65,7 +65,7 @@ const store = useSearchStore();
             store.displayNoResult
           "
           hideRefIndicator
-          :sourcesList="store.searchResults"
+          :sourcesList="store.searchResults || []"
           :isSourcesError="store.hasSourcesError"
           :isFetchingSources="store.isFetchingSources"
           :shouldDisplayScore="store.shouldDisplayScore"
@@ -89,6 +89,7 @@ const store = useSearchStore();
   overflow-y: auto;
   padding: 1rem 3rem 0rem 3rem;
 }
+
 .delete-button-wrapper {
   position: absolute;
   top: 0;
diff --git a/src/views/TutorPage.vue b/src/views/TutorPage.vue
index 820c446..5d4ba3e 100644
--- a/src/views/TutorPage.vue
+++ b/src/views/TutorPage.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed } from 'vue';
+import { computed, onMounted } from 'vue';
 import CursusInfo from '@/components/tutor/CursusInfo.vue';
 import SummariesStep from '@/components/tutor/SummariesStep.vue';
 import SourcesList from '@/components/tutor/SecondStep.vue';
@@ -8,6 +8,7 @@ import StepsIndicator from '@/components/tutor/StepsIndicator.vue';
 import ErrorComponent from '@/components/ErrorComponent.vue';
 import { useTutorStore } from '@/stores/tutor';
 import StatusModal from '@/components/tutor/StatusModal.vue';
+import { scrollToAnchor } from '@/utils/navigation';
 
 const store = useTutorStore();
 
@@ -43,6 +44,10 @@ const stepToAction: Record<1 | 2 | 3 | 4, (arg?: any) => Promise<void>> = {
   3: store.handleCreateSyllabus,
   4: store.handleDownloadSyllabus
 };
+
+onMounted(() => {
+  scrollToAnchor(`target-${store.step}`);
+});
 </script>
 <template>
   <div class="content-centered-wrapper">