diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
index 0ad35490..20550255 100644
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@@ -60,6 +60,7 @@ const onDataSaved = (formData, requestResponse) => {
                         v-model="data.name"
                         :required="true"
                         :rules="validate('bankEntity.name')"
+                        autofocus
                     />
                 </div>
                 <div class="col">
diff --git a/src/components/ui/VnRow.vue b/src/components/ui/VnRow.vue
index f2d2b55d..a2f89ff3 100644
--- a/src/components/ui/VnRow.vue
+++ b/src/components/ui/VnRow.vue
@@ -1,17 +1,17 @@
 <template>
-    <div id="row" class="q-gutter-md q-mb-md">
+    <div class="vn-row q-gutter-md q-mb-md">
         <slot></slot>
     </div>
 </template>
 <style lang="scss" scopped>
-#row {
+.vn-row {
     display: flex;
     > * {
         flex: 1;
     }
 }
 @media screen and (max-width: 800px) {
-    #row {
+    .vn-row {
         flex-direction: column;
     }
 }
diff --git a/src/css/app.scss b/src/css/app.scss
index 4fec9db0..35a36797 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -89,3 +89,6 @@ input::-webkit-inner-spin-button {
     -webkit-appearance: none;
     -moz-appearance: none;
 }
+.vn-row > .flex-0 {
+    flex: 0;
+}
diff --git a/src/pages/Supplier/Card/SupplierAccounts.vue b/src/pages/Supplier/Card/SupplierAccounts.vue
index 41df6adb..8600d421 100644
--- a/src/pages/Supplier/Card/SupplierAccounts.vue
+++ b/src/pages/Supplier/Card/SupplierAccounts.vue
@@ -102,64 +102,58 @@ onMounted(() => {
                     :key="index"
                     class="row q-gutter-md q-mb-md"
                 >
-                    <div class="col">
-                        <VnInput :label="t('supplier.accounts.iban')" v-model="row.iban">
-                            <template #append>
-                                <QIcon name="info" class="cursor-info">
-                                    <QTooltip>{{
-                                        t('components.iban_tooltip')
-                                    }}</QTooltip>
-                                </QIcon>
-                            </template>
-                        </VnInput>
-                    </div>
-                    <div class="col">
-                        <VnSelectDialog
-                            :label="t('worker.create.bankEntity')"
-                            v-model="row.bankEntityFk"
-                            :options="bankEntitiesOptions"
-                            option-label="bic"
-                            option-value="id"
-                            hide-selected
-                        >
-                            <template #form>
-                                <CreateBankEntityForm
-                                    @on-data-saved="
-                                        (_, requestResponse) =>
-                                            onBankEntityCreated(requestResponse, row)
-                                    "
-                                    :show-entity-field="false"
-                                />
-                            </template>
-                            <template #option="scope">
-                                <QItem v-bind="scope.itemProps">
-                                    <QItemSection v-if="scope.opt">
-                                        <QItemLabel
-                                            >{{ scope.opt.bic }}
-                                            {{ scope.opt.name }}</QItemLabel
-                                        >
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelectDialog>
-                    </div>
-                    <div class="col">
-                        <VnInput
-                            :label="t('supplier.accounts.beneficiary')"
-                            v-model="row.beneficiary"
-                        >
-                            <template #append>
-                                <QIcon name="info" class="cursor-pointer">
-                                    <QTooltip>{{
-                                        t(
-                                            'Name of the bank account holder if different from the provider'
-                                        )
-                                    }}</QTooltip>
-                                </QIcon>
-                            </template>
-                        </VnInput>
-                    </div>
-                    <div class="col-1 row justify-center items-center">
+                    <VnInput :label="t('supplier.accounts.iban')" v-model="row.iban">
+                        <template #append>
+                            <QIcon name="info" class="cursor-info">
+                                <QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
+                            </QIcon>
+                        </template>
+                    </VnInput>
+
+                    <VnSelectDialog
+                        :label="t('worker.create.bankEntity')"
+                        v-model="row.bankEntityFk"
+                        :options="bankEntitiesOptions"
+                        option-label="bic"
+                        option-value="id"
+                        hide-selected
+                    >
+                        <template #form>
+                            <CreateBankEntityForm
+                                @on-data-saved="
+                                    (_, requestResponse) =>
+                                        onBankEntityCreated(requestResponse, row)
+                                "
+                                :show-entity-field="false"
+                            />
+                        </template>
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection v-if="scope.opt">
+                                    <QItemLabel
+                                        >{{ scope.opt.bic }}
+                                        {{ scope.opt.name }}</QItemLabel
+                                    >
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectDialog>
+
+                    <VnInput
+                        :label="t('supplier.accounts.beneficiary')"
+                        v-model="row.beneficiary"
+                    >
+                        <template #append>
+                            <QIcon name="info" class="cursor-pointer">
+                                <QTooltip>{{
+                                    t(
+                                        'Name of the bank account holder if different from the provider'
+                                    )
+                                }}</QTooltip>
+                            </QIcon>
+                        </template>
+                    </VnInput>
+                    <div class="row justify-end items-center flex-0">
                         <QIcon
                             name="delete"
                             size="sm"
@@ -174,23 +168,24 @@ onMounted(() => {
                     </div>
                 </VnRow>
                 <VnRow>
-                    <QIcon
-                        name="add"
-                        size="sm"
-                        class="cursor-pointer"
-                        color="primary"
-                        @click="supplierAccountRef.insert()"
-                    >
-                        <QTooltip>
-                            {{ t('Add account') }}
-                        </QTooltip>
-                    </QIcon>
+                    <div class="row items-center">
+                        <QIcon
+                            name="add"
+                            size="sm"
+                            class="cursor-pointer"
+                            color="primary"
+                            @click="supplierAccountRef.insert()"
+                        >
+                            <QTooltip>
+                                {{ t('Add account') }}
+                            </QTooltip>
+                        </QIcon>
+                    </div>
                 </VnRow>
             </QCard>
         </template>
     </CrudModel>
 </template>
-
 <i18n>
     es:
         Do you want to change the pay method to wire transfer?: ¿Quieres modificar la forma de pago a transferencia?
diff --git a/src/pages/Supplier/Card/SupplierAgencyTerm.vue b/src/pages/Supplier/Card/SupplierAgencyTerm.vue
index 769ff4da..b53ace0a 100644
--- a/src/pages/Supplier/Card/SupplierAgencyTerm.vue
+++ b/src/pages/Supplier/Card/SupplierAgencyTerm.vue
@@ -108,7 +108,7 @@ onMounted(() => {
                             type="number"
                         />
                     </div>
-                    <div class="col-1 row justify-center items-center">
+                    <div class="flex-0 row justify-center items-center">
                         <QIcon
                             name="delete"
                             size="sm"
diff --git a/src/pages/Supplier/Card/SupplierContacts.vue b/src/pages/Supplier/Card/SupplierContacts.vue
index 3abe5a9c..5f1ecd83 100644
--- a/src/pages/Supplier/Card/SupplierContacts.vue
+++ b/src/pages/Supplier/Card/SupplierContacts.vue
@@ -81,7 +81,7 @@ onMounted(() => {
                                 autogrow
                             />
                         </div>
-                        <div class="col-1 row justify-center items-center">
+                        <div class="flex-0 row justify-center items-center">
                             <QIcon
                                 name="delete"
                                 size="sm"