diff --git a/client/web/compose/src/components/Admin/Module/Records/ColumnPicker.vue b/client/web/compose/src/components/Admin/Module/Records/ColumnPicker.vue
index 3c15df806..b3ed9a11f 100644
--- a/client/web/compose/src/components/Admin/Module/Records/ColumnPicker.vue
+++ b/client/web/compose/src/components/Admin/Module/Records/ColumnPicker.vue
@@ -1,16 +1,17 @@
 <template>
   <div class="d-flex">
     <b-button
-      v-b-modal.columns
       size="lg"
       variant="light"
       class="flex-fill"
+      @click="showModal = true"
     >
       {{ $t('allRecords.columns.title') }}
     </b-button>
 
     <b-modal
       id="columns"
+      v-model="showModal"
       size="lg"
       scrollable
       :ok-title="$t('general.label.saveAndClose')"
@@ -68,6 +69,8 @@ export default {
 
   data () {
     return {
+      showModal: false,
+
       filteredFields: [],
     }
   },
diff --git a/client/web/compose/src/components/Common/RecordToolbar.vue b/client/web/compose/src/components/Common/RecordToolbar.vue
index 7d80772af..455a0cfd1 100644
--- a/client/web/compose/src/components/Common/RecordToolbar.vue
+++ b/client/web/compose/src/components/Common/RecordToolbar.vue
@@ -129,7 +129,6 @@
         :processing="processingSubmit"
         :text="labels.submit || $t('label.save')"
         size="lg"
-        style="min-height: 42px; min-width: 73px;"
         @submit="$emit('submit')"
       />
     </template>
diff --git a/client/web/compose/src/components/PageBlocks/RecordListBase.vue b/client/web/compose/src/components/PageBlocks/RecordListBase.vue
index f163cd9af..0dcd85fa6 100644
--- a/client/web/compose/src/components/PageBlocks/RecordListBase.vue
+++ b/client/web/compose/src/components/PageBlocks/RecordListBase.vue
@@ -961,7 +961,7 @@ export default {
         ? []
         : this.options.editFields.map(({ name }) => name)
 
-      if (this.customConfiguredFields.length > 0) {
+      if (!this.options.hideConfigureFieldsButton && this.customConfiguredFields.length > 0) {
         fields = this.recordListModule.filterFields(this.customConfiguredFields)
       } else if (this.options.fields.length > 0) {
         fields = this.recordListModule.filterFields(this.options.fields)
diff --git a/client/web/compose/src/components/PageBlocks/RecordListConfigurator.vue b/client/web/compose/src/components/PageBlocks/RecordListConfigurator.vue
index b34dbc616..46b624f06 100644
--- a/client/web/compose/src/components/PageBlocks/RecordListConfigurator.vue
+++ b/client/web/compose/src/components/PageBlocks/RecordListConfigurator.vue
@@ -83,7 +83,7 @@
               <field-picker
                 :module="recordListModule"
                 :fields.sync="options.fields"
-                class="mb-2"
+                class="mb-3"
                 style="height: 40vh;"
               />
 
diff --git a/client/web/compose/src/views/Public/Pages/Records/View.vue b/client/web/compose/src/views/Public/Pages/Records/View.vue
index 1939b6fdb..1cdb963df 100644
--- a/client/web/compose/src/views/Public/Pages/Records/View.vue
+++ b/client/web/compose/src/views/Public/Pages/Records/View.vue
@@ -430,6 +430,8 @@ export default {
       if (this.showRecordModal) {
         this.popModalPreviousPage().then(({ recordID, recordPageID }) => {
           this.$emit('on-modal-back', { recordID, recordPageID, pushModalPreviousPage: false })
+          this.inCreating = recordID === NoID
+          this.inEditing = false
         })
 
         return
diff --git a/lib/vue/src/components/input/CInputConfirm.vue b/lib/vue/src/components/input/CInputConfirm.vue
index 8ef04330f..e431d79d1 100644
--- a/lib/vue/src/components/input/CInputConfirm.vue
+++ b/lib/vue/src/components/input/CInputConfirm.vue
@@ -20,7 +20,7 @@
         <slot v-else>
           <template v-if="!$slots.default">
             <font-awesome-icon
-              v-if="showIcon"
+              v-if="showIcon || !text"
               :icon="icon"
               :class="iconClass"
             />
diff --git a/lib/vue/src/components/input/CInputPresort.vue b/lib/vue/src/components/input/CInputPresort.vue
index b61fe4ea8..19a218825 100644
--- a/lib/vue/src/components/input/CInputPresort.vue
+++ b/lib/vue/src/components/input/CInputPresort.vue
@@ -66,6 +66,7 @@
             style="min-width: 80px; width: 80px;"
           >
             <c-input-confirm
+              show-icon
               @confirmed="items.splice(index, 1)"
             />
           </td>