diff --git a/src/admin/components/other/checkbox-filter-modal.vue b/src/admin/components/other/checkbox-filter-modal.vue
index 3db734011..0951cbdc1 100644
--- a/src/admin/components/other/checkbox-filter-modal.vue
+++ b/src/admin/components/other/checkbox-filter-modal.vue
@@ -80,7 +80,9 @@
                                 :native-value="option.id">
                             {{ `${option.name}` }}
                         </b-checkbox>
-                        <a @click="getOptionChildren(option, key, index)">
+                        <a
+                                v-if="option.total_children > 0"
+                                @click="getOptionChildren(option, key, index)">
                             <b-icon
                                     class="is-pulled-right"
                                     icon="menu-right"
@@ -97,21 +99,6 @@
                                     icon="chevron-down"/>
                         </div>
                     </li>
-                    <li
-                            v-else
-                            class="tainacan-li-no-children">
-                        <section
-                                class="field is-grouped-centered">
-                            <div class="content has-text-gray has-text-centered">
-                                <p>
-                                    <b-icon
-                                            icon="format-list-checks"
-                                            size="is-medium"/>
-                                </p>
-                                <p>{{ $i18n.get('info_no_more_options') }}</p>
-                            </div>
-                        </section>
-                    </li>
                     <b-loading
                             :is-full-page="false"
                             :active.sync="isColumnLoading"/>
@@ -508,7 +495,9 @@
     }
 
     .tainacan-modal-content {
-        width: auto; min-height: 600px;
+        width: auto;
+        min-height: 600px;
+        border-radius: 10px;
     }
 
     .tainacan-modal-title {
@@ -544,12 +533,20 @@
 
     .tainacan-li-checkbox-modal {
         display: flex;
+
+        .b-checkbox {
+            max-width: 86%;
+            margin-left: 0.7rem;
+            height: 24px;
+        }
+
         &:hover {
             background-color: $blue1;
         }
+
     }
 
-    .tainacan-li-checkbox-list{
+    .tainacan-li-checkbox-list {
         flex-grow: 1;
         flex-shrink: 1;
         max-width: 366px;
@@ -557,6 +554,10 @@
         .b-checkbox {
             margin-right: 10px;
         }
+
+        &:hover {
+            background-color: $blue1;
+        }
     }
 
     .tainacan-finder-columns-container {
@@ -580,11 +581,13 @@
         min-width: 200px;
         overflow-y: auto;
         list-style: none;
-        padding: 0 0.2rem 0 1rem;
 
-        .b-checkbox {
-            max-width: 86%;
-        }
+        // For Safari
+        -webkit-margin-after: 0;
+        -webkit-margin-start: 0;
+        -webkit-margin-end: 0;
+        -webkit-padding-start: 0;
+        -webkit-margin-before: 0;
     }
 
     .tainacan-li-checkbox-modal:first-child {
diff --git a/src/admin/scss/_tainacan-form.scss b/src/admin/scss/_tainacan-form.scss
index c4dea3f0a..f17895b5f 100644
--- a/src/admin/scss/_tainacan-form.scss
+++ b/src/admin/scss/_tainacan-form.scss
@@ -59,8 +59,9 @@
         }
     }
     .radio, .checkbox {
-        margin-bottom: 5px;
         align-items: center;
+        margin-bottom: 0;
+
         width: 100%;
         
         &.is-danger {
diff --git a/src/admin/tainacan-admin-i18n.php b/src/admin/tainacan-admin-i18n.php
index 9c6000912..c8ce1481f 100644
--- a/src/admin/tainacan-admin-i18n.php
+++ b/src/admin/tainacan-admin-i18n.php
@@ -402,7 +402,6 @@ return apply_filters( 'tainacan-admin-i18n', [
 	'info_there_are_no_metadata_to_search'           => __( 'There are no metadata to search', 'tainacan' ),
 	'info_there_are_no_metadata_in_repository_level' => __( 'There are no metadata in repository level', 'tainacan' ),
 	'info_import_a_collection'						 => __( 'Import a collection from external sources', 'tainacan' ),
-	'info_no_more_options'                           => __( 'No more options', 'tainacan' ),
 
 	// Tainacan Metadatum Types
 	'tainacan-text'                                  => __( 'Text', 'tainacan' ),