diff --git a/apps/dumili/src/components/TableOfContents.vue b/apps/dumili/src/components/TableOfContents.vue
index e80855a05..c7d9fbefb 100644
--- a/apps/dumili/src/components/TableOfContents.vue
+++ b/apps/dumili/src/components/TableOfContents.vue
@@ -103,7 +103,9 @@
               (_left: number, _top: number, _width: number, height: number) =>
                 onEntryResizeStop(idx, height)
             "
-            @click="currentEntry = entry"
+            @click="
+              currentPage = getFirstPageOfEntry(indexation.entries, entry.id)
+            "
           ></vue-draggable-resizable>
           <b-button
             v-if="
@@ -218,15 +220,6 @@ watchDebounced(
   { debounce: 500, maxWait: 1000 },
 );
 
-watch(currentEntry, (entry) => {
-  if (entry) {
-    currentPage.value = getFirstPageOfEntry(
-      indexation.value!.entries,
-      entry.id,
-    );
-  }
-});
-
 watch(
   currentPage,
   (value) => {
diff --git a/apps/dumili/src/components/UploadWidget.vue b/apps/dumili/src/components/UploadWidget.vue
index 30cf41089..db2c2f481 100644
--- a/apps/dumili/src/components/UploadWidget.vue
+++ b/apps/dumili/src/components/UploadWidget.vue
@@ -15,7 +15,8 @@ const dumiliSocket = inject(dumiliSocketInjectionKey)!;
 
 const { user } = storeToRefs(webStores.collection());
 
-const { folderName } = defineProps<{
+const { folderName, parentSelector } = defineProps<{
+  parentSelector: string;
   folderName: string;
 }>();
 
@@ -38,8 +39,9 @@ const uploadWidget = cloudinary.createUploadWidget(
     cloudName: import.meta.env.VITE_CLOUDINARY_CLOUDNAME,
     uploadPreset: "p1urov1k",
     folder: `dumili/${user.value!.username}/${folderName}`,
+    inlineContainer: parentSelector,
     showPoweredBy: false,
-    sources: ["local", "url"],
+    sources: ["local", "url", "camera"],
     multiple: true,
     maxFileSize: 10 * 1024 * 1024,
     maxImageFileSize: 5 * 1024 * 1024,
diff --git a/apps/dumili/src/pages/index.vue b/apps/dumili/src/pages/index.vue
index c37dc689d..0677f1f71 100644
--- a/apps/dumili/src/pages/index.vue
+++ b/apps/dumili/src/pages/index.vue
@@ -38,42 +38,48 @@
       }}</b-button>
     </div>
     <b-modal
-      v-if="stepNumber === 0"
+      id="new-indexation-modal"
       v-model="modal"
-      title="Indexation"
+      :title="$t('Nouvelle indexation')"
+      :cancel-title="$t('Annuler')"
       align="center"
       centered
-      ok-title="Toutes les pages"
-      cancel-title="Seulement certaines pages"
-      @ok.prevent="uploadType = 'all'"
-      @cancel.prevent="uploadType = 'some'"
+      :no-footer="stepNumber === 1"
+      @ok.prevent="$refs.form!.$el.reportValidity() && (stepNumber = 1)"
     >
-      {{
-        $t(
-          "De quelles pages du numéro que vous souhaitez indexer possédez vous des scans ?",
-        )
-      }}
-      <b-alert variant="info" model-value :dismissible="false" class="mt-3"
-        ><i18n-t
-          keypath="Si vous possédez les pages du magazine avec le format PDF,
-        assurez-vous que celui-ci ait une taille de fichier de 10 MB au maximum.
-        Si ce n'est pas le cas, vous pouvez utiliser un outil tel que {link} pour compresser votre fichier de telle sorte qu'il fasse moins de 10 MB."
-        >
-          <template #link
-            ><a
-              href="https://bigpdf.11zon.com/en/compress-pdf/compress-pdf-to-10mb"
-              >11zon.com</a
-            ></template
-          >
-        </i18n-t></b-alert
+      <b-form
+        v-if="stepNumber === 0"
+        ref="form"
+        @submit.prevent.stop="stepNumber = 1"
       >
-    </b-modal>
-    <upload-widget
-      v-if="showUploadWidget && cloudinaryFolderName"
-      :folder-name="cloudinaryFolderName"
-      @done="onUploadDone"
-      @abort="showUploadWidget = !showUploadWidget"
-  /></b-container>
+        {{
+          $t(
+            "Combien de pages le magazine contient-il ? (y compris les pages que vous ne souhaitez pas indexer)",
+          )
+        }}
+        <b-form-input v-model="totalPages" type="number" />
+      </b-form>
+      <div v-else>
+        <b-alert variant="info" model-value :dismissible="false" class="mt-3"
+          ><i18n-t
+            keypath="Si vous possédez les pages du magazine avec le format PDF, assurez-vous que celui-ci ait une taille de fichier de 10 MB au maximum. Si ce n'est pas le cas, vous pouvez utiliser un outil tel que {link} pour compresser votre fichier de telle sorte qu'il fasse moins de 10 MB."
+          >
+            <template #link
+              ><a
+                href="https://bigpdf.11zon.com/en/compress-pdf/compress-pdf-to-10mb"
+                >11zon.com</a
+              ></template
+            >
+          </i18n-t></b-alert
+        >
+        <upload-widget
+          v-if="showUploadWidget && cloudinaryFolderName"
+          parent-selector="#new-indexation-modal .modal-body"
+          :folder-name="cloudinaryFolderName"
+          @done="onUploadDone"
+          @abort="showUploadWidget = !showUploadWidget"
+        /></div></b-modal
+  ></b-container>
 </template>
 
 <script setup lang="ts">
@@ -84,16 +90,16 @@ const {
   indexations: { services: indexationsServices },
 } = inject(dumiliSocketInjectionKey)!;
 
+const form = ref<HTMLFormElement | null>(null);
 const currentIndexations = ref<IndexationWithFirstPage[] | null>(null);
 const modal = ref(false);
+const totalPages = ref(16);
 const cloudinaryFolderName = ref<string | null>(null);
 const stepNumber = ref<0 | 1>(0);
-const uploadType = ref<"all" | "some" | null>(null);
 const showUploadWidget = ref(false);
 
-watch(uploadType, (newUploadType) => {
-  if (newUploadType !== null) {
-    stepNumber.value = 1;
+watch(stepNumber, (newStepNumber) => {
+  if (newStepNumber > 0) {
     showUploadWidget.value = true;
     cloudinaryFolderName.value = new Date()
       .toISOString()
@@ -114,3 +120,13 @@ const onUploadDone = async () => {
   }
 })();
 </script>
+
+<style lang="scss">
+.modal {
+  @media (min-width: 576px) {
+    .modal-dialog {
+      max-width: 800px;
+    }
+  }
+}
+</style>
\ No newline at end of file