diff --git a/packages/page-staking/src/Actions/Account/BondExtra.tsx b/packages/page-staking/src/Actions/Account/BondExtra.tsx
index affc3f11de..ed9259856a 100644
--- a/packages/page-staking/src/Actions/Account/BondExtra.tsx
+++ b/packages/page-staking/src/Actions/Account/BondExtra.tsx
@@ -66,7 +66,6 @@ function BondExtra ({ onClose, stashId }: Props): React.ReactElement<Props> {
           onStart={onClose}
           params={[maxAdditional]}
           tx='staking.bondExtra'
-          withSpinner={false}
         />
       </Modal.Actions>
     </Modal>
diff --git a/packages/page-staking/src/Actions/Account/Nominate.tsx b/packages/page-staking/src/Actions/Account/Nominate.tsx
index 6ee1195749..cc16e572cc 100644
--- a/packages/page-staking/src/Actions/Account/Nominate.tsx
+++ b/packages/page-staking/src/Actions/Account/Nominate.tsx
@@ -55,13 +55,11 @@ function Nominate ({ className, controllerId, isOpen, next, nominees, onClose, s
     >
       <Modal.Content className='ui--signer-Signer-Content'>
         <InputAddress
-          className='medium'
           defaultValue={controllerId}
           isDisabled
           label={t('controller account')}
         />
         <InputAddress
-          className='medium'
           defaultValue={stashId}
           isDisabled
           label={t('stash account')}
@@ -69,7 +67,6 @@ function Nominate ({ className, controllerId, isOpen, next, nominees, onClose, s
         <InputAddressMulti
           available={available}
           availableLabel={t('candidate accounts')}
-          className='medium'
           defaultValue={nominees}
           help={t('Filter available candidates based on name, address or short account index.')}
           maxCount={MAX_NOMINEES}
diff --git a/packages/page-staking/src/Actions/Account/SetControllerAccount.tsx b/packages/page-staking/src/Actions/Account/SetControllerAccount.tsx
index 91b4e079a9..11ddf088fe 100644
--- a/packages/page-staking/src/Actions/Account/SetControllerAccount.tsx
+++ b/packages/page-staking/src/Actions/Account/SetControllerAccount.tsx
@@ -67,7 +67,6 @@ function SetControllerAccount ({ defaultControllerId, isValidating, onClose, sta
           onStart={onClose}
           params={[controllerId]}
           tx='staking.setController'
-          withSpinner={false}
         />
       </Modal.Actions>
     </Modal>
diff --git a/packages/page-staking/src/Actions/Account/SetRewardDestination.tsx b/packages/page-staking/src/Actions/Account/SetRewardDestination.tsx
index bd1a99a830..36c85ddebb 100644
--- a/packages/page-staking/src/Actions/Account/SetRewardDestination.tsx
+++ b/packages/page-staking/src/Actions/Account/SetRewardDestination.tsx
@@ -52,7 +52,6 @@ function SetRewardDestination ({ controllerId, defaultDestination, onClose }: Pr
           onStart={onClose}
           params={[destination]}
           tx={'staking.setPayee'}
-          withSpinner={false}
         />
       </Modal.Actions>
     </Modal>
diff --git a/packages/page-staking/src/Actions/Account/Unbond.tsx b/packages/page-staking/src/Actions/Account/Unbond.tsx
index f2bec9b4a5..8815776470 100644
--- a/packages/page-staking/src/Actions/Account/Unbond.tsx
+++ b/packages/page-staking/src/Actions/Account/Unbond.tsx
@@ -75,7 +75,6 @@ function Unbond ({ className, controllerId, onClose, stakingLedger, stashId }: P
           onStart={onClose}
           params={[maxUnbond]}
           tx='staking.unbond'
-          withSpinner={false}
         />
       </Modal.Actions>
     </Modal>
diff --git a/packages/page-staking/src/Actions/Account/Validate.tsx b/packages/page-staking/src/Actions/Account/Validate.tsx
index 2d3ca3e8c1..9520b958df 100644
--- a/packages/page-staking/src/Actions/Account/Validate.tsx
+++ b/packages/page-staking/src/Actions/Account/Validate.tsx
@@ -64,7 +64,6 @@ function Validate ({ controllerId, onClose, stashId }: Props): React.ReactElemen
           onStart={onClose}
           params={[prefs]}
           tx='staking.validate'
-          withSpinner={false}
         />
       </Modal.Actions>
     </Modal>
diff --git a/packages/page-staking/src/Actions/useInactives.ts b/packages/page-staking/src/Actions/useInactives.ts
index 937e879852..8e61592d3e 100644
--- a/packages/page-staking/src/Actions/useInactives.ts
+++ b/packages/page-staking/src/Actions/useInactives.ts
@@ -24,15 +24,15 @@ export default function useInactives (stashId: string, nominees?: string[]): str
             ? nominees.map((id) => [api.query.staking.erasStakers, [indexes.activeEra, id]])
             : nominees.map((id) => [api.query.staking.stakers, id]),
           (exposures: Exposure[]): void => {
-            const inactives: string[] = [];
-
-            exposures.forEach((exposure, index): void => {
-              if (!exposure.others.some((indv): boolean => indv.who.eq(stashId))) {
-                inactives.push(nominees[index].toString());
-              }
-            });
-
-            mountedRef.current && setInactives(inactives);
+            mountedRef.current && setInactives(
+              exposures
+                .map((exposure, index) =>
+                  exposure.others.some(({ who }) => who.eq(stashId))
+                    ? null
+                    : nominees[index].toString()
+                )
+                .filter((inactiveId): inactiveId is string => !!inactiveId)
+            );
           }
         )
         .then((_unsub): void => {
diff --git a/packages/page-staking/src/Payouts/Stash.tsx b/packages/page-staking/src/Payouts/Stash.tsx
index 738c4278e8..0805fa8f45 100644
--- a/packages/page-staking/src/Payouts/Stash.tsx
+++ b/packages/page-staking/src/Payouts/Stash.tsx
@@ -90,7 +90,6 @@ function Stash ({ className, isDisabled, payout: { available, rewards, stashId }
             isDisabled={!extrinsic || isDisabled}
             isPrimary={false}
             label={t('Payout')}
-            withSpinner={false}
           />
         )}
       </td>
diff --git a/packages/page-sudo/src/Sudo.tsx b/packages/page-sudo/src/Sudo.tsx
index cd82082e6b..53b8098054 100644
--- a/packages/page-sudo/src/Sudo.tsx
+++ b/packages/page-sudo/src/Sudo.tsx
@@ -39,7 +39,6 @@ function Propose ({ isMine, sudoKey }: Props): React.ReactElement<Props> {
             label={t('Submit Sudo')}
             params={[method]}
             tx='sudo.sudo'
-            withSpinner={false}
           />
         </Button.Group>
       </section>