diff --git a/build-watch.sh b/build-watch.sh
index 698d272ee..0c17fdcb5 100755
--- a/build-watch.sh
+++ b/build-watch.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 ## Run the build script whenever there is a change in src folder
 
 
diff --git a/src/admin/components/edition/field-edition-form.vue b/src/admin/components/edition/field-edition-form.vue
index a806fc309..55f678173 100644
--- a/src/admin/components/edition/field-edition-form.vue
+++ b/src/admin/components/edition/field-edition-form.vue
@@ -13,7 +13,7 @@
         </b-field>
 
         <b-field
-            :addons="false" 
+            :addons="false"
             :type="formErrors['description'] != undefined ? 'is-danger' : ''" 
             :message="formErrors['description'] != undefined ? formErrors['description'] : ''">
             <label class="label">{{$i18n.get('label_description')}} <a class="help-button"><b-icon size="is-small" icon="help-circle-outline"></b-icon></a></label>
diff --git a/src/admin/components/lists/fields-list.vue b/src/admin/components/lists/fields-list.vue
index 59888bd5a..fb1d8de07 100644
--- a/src/admin/components/lists/fields-list.vue
+++ b/src/admin/components/lists/fields-list.vue
@@ -13,6 +13,8 @@
                     :list="activeFieldList" 
                     :options="{ 
                             group: { name:'fields', pull: false, put: true }, 
+                            sort: openedFieldId == '' || openedFieldId == undefined, 
+                            disabled: openedFieldId != '' && openedFieldId != undefined,
                             handle: '.handle', 
                             ghostClass: 'sortable-ghost',
                             filter: 'not-sortable-item', 
@@ -20,7 +22,7 @@
                     <div  
                         class="active-field-item"
                         :class="{
-                            'not-sortable-item': field.id == undefined || openedFieldId == field.id, 
+                            'not-sortable-item': field.id == undefined || openedFieldId != '' , 
                             'not-focusable-item': openedFieldId == field.id, 
                             'disabled-field': field.enabled == false}" 
                         v-for="(field, index) in activeFieldList" :key="index">
@@ -368,11 +370,17 @@ export default {
                 i, i:before { font-size: 20px; }
             }
     
-            &.not-sortable-item, &.not-sortable-item:hover, &.not-focusable-item, &.not-focusable-item:hover {
-                box-shadow: none !important;
+            &.not-sortable-item, &.not-sortable-item:hover {
                 cursor: default;
                 background-color: white !important;
-                
+
+                .label-details, .icon {
+                    color: $gray !important;
+                }
+            } 
+            &.not-focusable-item, &.not-focusable-item:hover {
+                cursor: default;
+               
                 .field-name {
                     color: $primary;
                 }
diff --git a/src/admin/components/lists/filters-list.vue b/src/admin/components/lists/filters-list.vue
index e93c4bb7f..01624acbd 100644
--- a/src/admin/components/lists/filters-list.vue
+++ b/src/admin/components/lists/filters-list.vue
@@ -13,6 +13,8 @@
                     :list="activeFilterList" 
                     :options="{
                         group: { name:'filters', pull: false, put: true }, 
+                        sort: openedFilterId == '' || openedFilterId == undefined, 
+                        disabled: openedFilterId != '' && openedFilterId != undefined,
                         handle: '.handle', 
                         ghostClass: 'sortable-ghost',
                         filter: 'not-sortable-item', 
@@ -20,7 +22,7 @@
                     <div  
                         class="active-filter-item" 
                         :class="{
-                            'not-sortable-item': filter.id == undefined || openedFilterId == filter.id || choosenField.name == filter.name, 
+                            'not-sortable-item': filter.id == undefined || openedFilterId != '' || choosenField.name == filter.name, 
                             'not-focusable-item': openedFilterId == filter.id, 
                             'disabled-filter': filter.enabled == false
                         }" 
@@ -485,11 +487,17 @@ export default {
                 border-bottom: 1px solid $draggable-border-color;
                 margin-top: 1.0em;
             }
-            &.not-sortable-item, &.not-sortable-item:hover, &.not-focusable-item, &.not-focusable-item:hover  {
-                box-shadow: none !important;
-                background-color: white !important;
+            &.not-sortable-item, &.not-sortable-item:hover {
                 cursor: default;
+                background-color: white !important;
 
+                .label-details, .icon {
+                    color: $gray !important;
+                }
+            } 
+            &.not-focusable-item, &.not-focusable-item:hover {
+                cursor: default;
+               
                 .field-name {
                     color: $primary;
                 }