diff --git a/src/admin/components/edition/importer-edition-form.vue b/src/admin/components/edition/importer-edition-form.vue
index 2a4b14981..370880b80 100644
--- a/src/admin/components/edition/importer-edition-form.vue
+++ b/src/admin/components/edition/importer-edition-form.vue
@@ -6,91 +6,107 @@
                 class="tainacan-form" 
                 label-width="120px"
                 v-if="importer != undefined && importer != null">
-
-
-            <!-- Target collection selection -------------------------------- --> 
-            <b-field
-                    v-if="importer.manual_collection"
-                    :addons="false" 
-                    :label="$i18n.get('label_target_collection')">
-                <help-button 
-                        :title="$i18n.get('label_target_collection')" 
-                        :message="$i18n.get('info_target_collection_helper')"/>
-                <br>
-                <div class="is-inline">
-                    <b-select
-                            id="tainacan-select-target-collection"
-                            :value="collectionId"
-                            @input="onSelectCollection($event)"
-                            :loading="isFetchingCollections"
-                            :placeholder="$i18n.get('instruction_select_a_target_collection')">
-                        <option
-                                v-for="collection of collections"
-                                :key="collection.id"
-                                :value="collection.id">{{ collection.name }}
-                        </option>
-                    </b-select>
-                    <router-link
-                            tag="a" 
-                            class="is-inline add-link"     
-                            :to="{ path: $routerHelper.getNewCollectionPath(), query: { fromImporter: true }}">
-                        <b-icon
-                                icon="plus-circle"
-                                size="is-small"
-                                type="is-secondary"/>
-                            {{ $i18n.get('new_blank_collection') }}</router-link>
+            <div class="columns is-gapless">
+                <div 
+                        v-if="importer.options_form != undefined && importer.options_form != null && importer.options_form != ''"
+                        class="column">
+                    <!-- Importer custom options -->
+                    <form id="importerOptionsForm">
+                        <div v-html="importer.options_form"/>
+                    </form>
                 </div>
-            </b-field>
-
-            <!-- Importer custom options -->
-            <form 
-                    id="importerOptionsForm"
-                    v-if="importer.options_form != undefined && importer.options_form != null && importer.options_form != ''">
-                <div v-html="importer.options_form"/>
-            </form>
-
-            <!-- File Source input -->
-            <b-field
-                    v-if="importer.accepts.file"
-                    :addons="false">
-                <label class="label">{{ $i18n.get('label_source_file') }}</label>
-                <help-button 
-                        :title="$i18n.get('label_source_file')" 
-                        :message="$i18n.get('info_source_file_upload')"/>
-                <br>
-                <b-upload
-                        v-if="importer.tmp_file == undefined" 
-                        v-model="importerFile"
-                        drag-drop>
-                    <section class="drop-inner">
-                        <div class="content has-text-centered">
-                            <p>
+                <div class="column">
+                    <!-- Target collection selection -------------------------------- --> 
+                    <b-field
+                            v-if="importer.manual_collection"
+                            :addons="false" 
+                            :label="$i18n.get('label_target_collection')">
+                        <help-button 
+                                :title="$i18n.get('label_target_collection')" 
+                                :message="$i18n.get('info_target_collection_helper')"/>
+                        <br>
+                        <div class="is-inline">
+                            <b-select
+                                    expanded
+                                    id="tainacan-select-target-collection"
+                                    :value="collectionId"
+                                    @input="onSelectCollection($event)"
+                                    :loading="isFetchingCollections"
+                                    :placeholder="$i18n.get('instruction_select_a_target_collection')">
+                                <option
+                                        v-for="collection of collections"
+                                        :key="collection.id"
+                                        :value="collection.id">{{ collection.name }}
+                                </option>
+                            </b-select>
+                            <router-link
+                                    tag="a" 
+                                    class="is-inline add-link"     
+                                    :to="{ path: $routerHelper.getNewCollectionPath(), query: { fromImporter: true }}">
                                 <b-icon
-                                        icon="upload"
-                                        size="is-large"/>
-                            </p>
-                            <p>{{ $i18n.get('instruction_drop_file_or_click_to_upload') }}</p>
+                                        icon="plus-circle"
+                                        size="is-small"
+                                        type="is-secondary"/>
+                                    {{ $i18n.get('new_blank_collection') }}</router-link>
                         </div>
-                    </section>
-                </b-upload>
-                <div v-if="importerFile != undefined">{{ importerFile[0].name }}</div>
-            </b-field>
+                    </b-field>
+                    <!-- File Source input -->
+                    <b-field
+                            v-if="importer.accepts.file"
+                            :addons="false">
+                        <label class="label">{{ $i18n.get('label_source_file') }}</label>
+                        <help-button 
+                                :title="$i18n.get('label_source_file')" 
+                                :message="$i18n.get('info_source_file_upload')"/>
+                        <br>
+                        <b-upload
+                                v-if="importer.tmp_file == undefined && (importerFile == undefined || importerFile == null || importerFile == '')" 
+                                v-model="importerFile"
+                                drag-drop
+                                class="source-file-upload">
+                            <section class="drop-inner">
+                                <div class="content has-text-centered">
+                                    <p>
+                                        <b-icon
+                                                icon="upload"
+                                                size="is-large"/>
+                                    </p>
+                                    <p>{{ $i18n.get('instruction_drop_file_or_click_to_upload') }}</p>
+                                </div>
+                            </section>
+                        </b-upload>
+                        <div 
+                                class="control selected-source-file"
+                                v-if="importerFile != undefined">
+                            <span>{{ importerFile[0].name }}</span>
+                            <a 
+                                    target="_blank"
+                                    @click.prevent="importerFile = undefined">
+                                <span class="icon">
+                                    <i class="mdi mdi-18px mdi-close"/>
+                                </span>
+                            </a>
+                        </div>
+                    </b-field>
 
-            <!-- URL source input -------------------------------- --> 
-            <b-field 
-                    v-if="importer.accepts.url"
-                    :addons="false"
-                    :label="$i18n.get('label_url_source_link')">
-                <help-button 
-                        :title="$i18n.get('label_url_source_link')" 
-                        :message="$i18n.get('info_url_source_link_helper')"/>
-                <b-input
-                        id="tainacan-url-link-source"
-                        v-model="url"/>  
-            </b-field>
+                    <!-- URL source input -------------------------------- --> 
+                    <b-field 
+                            v-if="importer.accepts.url"
+                            :addons="false"
+                            :label="$i18n.get('label_url_source_link')">
+                        <help-button 
+                                :title="$i18n.get('label_url_source_link')" 
+                                :message="$i18n.get('info_url_source_link_helper')"/>
+                        <b-input
+                                id="tainacan-url-link-source"
+                                v-model="url"/>  
+                    </b-field>
+                            
                     
+                </div>
+            </div>
             <!-- Form submit -------------------------------- --> 
-            <div class="field is-grouped form-submit">
+            <div class="columns is-gapless field is-grouped form-submit">
                 <div class="control">
                     <button
                             id="button-cancel-collection-creation"
@@ -130,7 +146,6 @@
                 </div>
             </div>
         </form>
-
         <b-loading 
                 :active.sync="isLoading" 
                 :can-cancel="false"/>
@@ -365,6 +380,14 @@ export default {
 
     @import "../../scss/_variables.scss";
 
+    .columns.is-gapless {
+        padding-left: $page-side-padding;
+        padding-right: $page-side-padding;
+
+        .column:not(:first-child) {
+            margin-left: $page-side-padding;
+        }
+    }
 
     .field {
         position: relative;
@@ -412,6 +435,20 @@ export default {
         }
     }
 
+    .source-file-upload {
+        width: 100%;
+        display: grid;
+    }
+
+    .selected-source-file {
+        border: 1px solid $gray2;
+        padding: 2px 10px;
+        font-size: .75rem;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+    }
+
 
 </style>
 
diff --git a/src/admin/components/edition/importer-mapping-form.vue b/src/admin/components/edition/importer-mapping-form.vue
index a0d457223..548f47ddc 100644
--- a/src/admin/components/edition/importer-mapping-form.vue
+++ b/src/admin/components/edition/importer-mapping-form.vue
@@ -85,19 +85,22 @@
                                 class="tainacan-modal-content">
                             <div class="tainacan-modal-title">
                                 <h2>{{ $i18n.get('instruction_select_metadatum_type') }}</h2>
+                                <a 
+                                        class="back-link"
+                                        @click="onMetadatumEditionCanceled(); isNewMetadatumModalActive = false">{{ $i18n.get('exit') }}</a>
                                 <hr>
                             </div>
-                            <b-select
-                                    :value="selectedMetadatumType"
-                                    @input="onSelectMetadatumType($event)"
-                                    :placeholder="$i18n.get('label_select_metadatum_type')">
-                                <option
-                                        v-for="(metadatumType, index) of metadatumTypes"
-                                        :key="index"
-                                        :value="metadatumType">
-                                    {{ metadatumType.name }}
-                                </option>
-                            </b-select>
+                            <section class="tainacan-form">
+                                <div class="metadata-types-container">
+                                    <div
+                                            class="metadata-type"
+                                            v-for="(metadatumType, index) of metadatumTypes"
+                                            :key="index"
+                                            @click="onSelectMetadatumType(metadatumType)">
+                                        <h4>{{ metadatumType.name }}</h4>           
+                                    </div>
+                                </div>
+                            </section>
                         </div>
                         <div 
                                 v-if="isEditingMetadatum"
@@ -488,6 +491,26 @@ export default {
         }
     }
 
+    .metadata-types-container {
+
+        .metadata-type {
+            border-bottom: 1px solid $gray2;
+            padding: 15px 8.3333333%;
+            cursor: pointer;
+        
+            &:first-child {
+                margin-top: 15px;
+            }
+            &:last-child {
+                border-bottom: none;
+            }
+            &:hover {
+                background-color: $gray1;
+            }
+        }
+    }
+
+
 
 </style>
 
diff --git a/src/admin/scss/_modals.scss b/src/admin/scss/_modals.scss
index 6242c382c..7820e57af 100644
--- a/src/admin/scss/_modals.scss
+++ b/src/admin/scss/_modals.scss
@@ -40,7 +40,7 @@
     }
 
     .form-submit {
-        padding: 80px 0em 0.4em 0em !important;
+        padding: 40px 0em 0.4em 0em !important;
     }
 }
 // Bulma modals customized for Tainacan
diff --git a/src/admin/scss/tainacan-admin.scss b/src/admin/scss/tainacan-admin.scss
index 3efa3d435..a83dfc2a3 100644
--- a/src/admin/scss/tainacan-admin.scss
+++ b/src/admin/scss/tainacan-admin.scss
@@ -74,7 +74,7 @@ a:hover {
         margin-top: 0; 
     }
 
-    .is-primary, .is-primary:hover, .is-primary:focus {
+    .is-primary:not(.upload-draggable), .is-primary:hover, .is-primary:focus {
         background-color: $blue4 !important;
         color: white !important;
     }
diff --git a/src/admin/tainacan-admin-i18n.php b/src/admin/tainacan-admin-i18n.php
index 36d97bf72..d6e7e5fd4 100644
--- a/src/admin/tainacan-admin-i18n.php
+++ b/src/admin/tainacan-admin-i18n.php
@@ -44,6 +44,7 @@ return apply_filters( 'tainacan-admin-i18n', [
 	'save'                                           => __( 'Save', 'tainacan' ),
 	'next'                                           => __( 'Next', 'tainacan' ),
 	'back'                                           => __( 'Back', 'tainacan' ),
+	'exit'                                           => __( 'Exit', 'tainacan' ),
 	'see'                                            => __( 'View', 'tainacan' ),
 	'search'                                         => __( 'Search', 'tainacan' ),
 	'advanced_search'                                => __( 'Advanced Search', 'tainacan' ),
@@ -301,7 +302,7 @@ return apply_filters( 'tainacan-admin-i18n', [
 	'instruction_select_a_mapper'                    => __( 'Select a mapper', 'tainacan' ),
 	'instruction_select_an_importer_type'            => __( 'Select an importer type from the options above:', 'tainacan' ),
 	'instruction_drop_file_or_click_to_upload'       => __( 'Drop your source file or click here to upload.', 'tainacan' ),
-	'instruction_select_metadatum_type'              => __( 'Select a metadatum type.', 'tainacan' ),
+	'instruction_select_metadatum_type'              => __( 'Select a metadatum type', 'tainacan' ),
 	'instruction_configure_new_metadatum'            => __( 'Configure new metadatum.', 'tainacan' ),
 	'instruction_insert_mapper_metadatum_info'       => __( 'Insert the new mapper\'s metadatum info', 'tainacan' ),
 	'instruction_select_max_options_to_show'         => __( 'Select max options to show', 'tainacan' ),