diff --git a/packages/server/src/modules/TransactionsLocking/commands/CommandTransactionsLockingService.ts b/packages/server/src/modules/TransactionsLocking/commands/CommandTransactionsLockingService.ts
index d5d43ef67..e70abb3b4 100644
--- a/packages/server/src/modules/TransactionsLocking/commands/CommandTransactionsLockingService.ts
+++ b/packages/server/src/modules/TransactionsLocking/commands/CommandTransactionsLockingService.ts
@@ -26,7 +26,7 @@ export class TransactionsLockingService {
   constructor(
     private readonly transactionsLockingRepo: TransactionsLockingRepository,
     private readonly eventPublisher: EventEmitter2,
-  ) {}
+  ) { }
 
   /**
    * Enable/disable all transacations locking.
diff --git a/packages/webapp/src/containers/Dialogs/AllocateLandedCostDialog/AllocateLandedCostFormFields.tsx b/packages/webapp/src/containers/Dialogs/AllocateLandedCostDialog/AllocateLandedCostFormFields.tsx
index 9ca8ab041..6b8af1446 100644
--- a/packages/webapp/src/containers/Dialogs/AllocateLandedCostDialog/AllocateLandedCostFormFields.tsx
+++ b/packages/webapp/src/containers/Dialogs/AllocateLandedCostDialog/AllocateLandedCostFormFields.tsx
@@ -10,7 +10,7 @@ import {
   InputGroup,
 } from '@blueprintjs/core';
 import classNames from 'classnames';
-import { FormattedMessage as T, If, FFormGroup, FSelect } from '@/components';
+import { FormattedMessage as T, If, FFormGroup, FSelect, FRadioGroup, FInputGroup } from '@/components';
 import { handleStringChange } from '@/utils';
 import { FieldRequiredHint } from '@/components';
 import { CLASSES } from '@/constants/classes';
@@ -31,7 +31,7 @@ export default function AllocateLandedCostFormFields() {
   const { costTransactionEntries, landedCostTransactions } =
     useAllocateLandedConstDialogContext();
 
-  const { values, setFieldValue } = useFormikContext();
+  const { values, setFieldValue, form } = useFormikContext();
 
   // Handle transaction type select change.
   const handleTransactionTypeChange = (type) => {
@@ -137,62 +137,51 @@ export default function AllocateLandedCostFormFields() {
       </If>
 
       {/*------------ Amount -----------*/}
-      <FastField name={'amount'}>
-        {({ form, field, meta: { error, touched } }) => (
-          <FormGroup
-            label={<T id={'amount'} />}
-            intent={inputIntent({ error, touched })}
-            helperText={<ErrorMessage name="amount" />}
-            className={'form-group--amount'}
-            inline={true}
-          >
-            <InputGroup
-              {...field}
-              onBlur={(e) => {
-                const amount = e.target.value;
-                const { allocation_method, items } = form.values;
+      <FFormGroup
+        name={'amount'}
+        label={<T id={'amount'} />}
+        inline={true}
+        fastField
+      >
+        <FInputGroup
+          name={'amount'}
+          onBlur={(e) => {
+            const amount = e.target.value;
+            const { allocation_method, items } = values;
 
-                form.setFieldValue(
-                  'items',
-                  allocateCostToEntries(amount, allocation_method, items),
-                );
-              }}
-            />
-          </FormGroup>
-        )}
-      </FastField>
+            setFieldValue(
+              'items',
+              allocateCostToEntries(amount, allocation_method, items),
+            );
+          }}
+        />
+      </FFormGroup>
 
       {/*------------ Allocation method -----------*/}
-      <Field name={'allocation_method'}>
-        {({ form, field: { value }, meta: { touched, error } }) => (
-          <FormGroup
-            medium={true}
-            label={<T id={'allocation_method'} />}
-            labelInfo={<FieldRequiredHint />}
-            className={'form-group--allocation_method'}
-            intent={inputIntent({ error, touched })}
-            helperText={<ErrorMessage name="allocation_method" />}
-            inline={true}
-          >
-            <RadioGroup
-              onChange={handleStringChange((_value) => {
-                const { amount, items } = form.values;
+      <FFormGroup
+        name={'allocation_method'}
+        label={<T id={'allocation_method'} />}
+        medium
+        inline
+        fastField
+      >
+        <FRadioGroup
+          name={'allocation_method'}
+          onChange={handleStringChange((_value) => {
+            const { amount, items } = values;
 
-                form.setFieldValue('allocation_method', _value);
-                form.setFieldValue(
-                  'items',
-                  allocateCostToEntries(amount, _value, items),
-                );
-              })}
-              selectedValue={value}
-              inline={true}
-            >
-              <Radio label={<T id={'quantity'} />} value="quantity" />
-              <Radio label={<T id={'valuation'} />} value="value" />
-            </RadioGroup>
-          </FormGroup>
-        )}
-      </Field>
+            setFieldValue('allocation_method', _value);
+            setFieldValue(
+              'items',
+              allocateCostToEntries(amount, _value, items),
+            );
+          })}
+          inline={true}
+        >
+          <Radio label={<T id={'quantity'} />} value="quantity" />
+          <Radio label={<T id={'valuation'} />} value="value" />
+        </FRadioGroup>
+      </FFormGroup>
 
       {/*------------ Allocate Landed cost Table -----------*/}
       <AllocateLandedCostFormBody />
diff --git a/packages/webapp/src/containers/Dialogs/InventoryAdjustmentFormDialog/InventoryAdjustmentFormDialogFields.tsx b/packages/webapp/src/containers/Dialogs/InventoryAdjustmentFormDialog/InventoryAdjustmentFormDialogFields.tsx
index f350fc9ce..0ac804d71 100644
--- a/packages/webapp/src/containers/Dialogs/InventoryAdjustmentFormDialog/InventoryAdjustmentFormDialogFields.tsx
+++ b/packages/webapp/src/containers/Dialogs/InventoryAdjustmentFormDialog/InventoryAdjustmentFormDialogFields.tsx
@@ -21,7 +21,6 @@ import {
   FeatureCan,
   BranchSelect,
   WarehouseSelect,
-  BranchSelectButton,
   FAccountsSuggestField,
 } from '@/components';
 import { momentFormatter, toSafeNumber } from '@/utils';
@@ -78,12 +77,11 @@ export default function InventoryAdjustmentFormDialogFields() {
           <Col xs={5}>
             <FormGroup
               label={<T id={'branch'} />}
-              className={classNames('form-group--select-list', Classes.FILL)}
+              fill
             >
               <BranchSelect
                 name={'branch_id'}
                 branches={branches}
-                input={BranchSelectButton}
                 popoverProps={{ minimal: true }}
               />
             </FormGroup>
@@ -93,7 +91,7 @@ export default function InventoryAdjustmentFormDialogFields() {
           <Col xs={5}>
             <FormGroup
               label={<T id={'warehouse'} />}
-              className={classNames('form-group--select-list', Classes.FILL)}
+              fill
             >
               <WarehouseSelect
                 name={'warehouse_id'}