diff --git a/packages/react-app/src/components/account/account-module.tsx b/packages/react-app/src/components/account/account-module.tsx
index c5fb8b05..13fbc2ad 100644
--- a/packages/react-app/src/components/account/account-module.tsx
+++ b/packages/react-app/src/components/account/account-module.tsx
@@ -5,6 +5,7 @@ import { Button, GU, IconConnect, springs } from '@1hive/1hive-ui';
 import { noop } from 'lodash-es';
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { animated, Transition } from 'react-spring/renderprops';
+import { getNetwork } from 'src/networks';
 import styled from 'styled-components';
 import { useWallet } from '../../contexts/wallet.context';
 import { getUseWalletProviders, isConnected } from '../../utils/web3.utils';
@@ -58,6 +59,7 @@ type Props = {
 function AccountModule({ compact = false }: Props) {
   const buttonRef = useRef<any>();
   const wallet = useWallet();
+  const { name } = getNetwork();
   const { walletAddress, activatingId, deactivateWallet, activateWallet } = wallet;
   const [opened, setOpened] = useState(false);
   const [animate, setAnimate] = useState(false);
@@ -161,7 +163,7 @@ function AccountModule({ compact = false }: Props) {
       {wallet.isWrongNetwork ? (
         <Button
           icon={<IconConnect />}
-          label="Switch wallet network"
+          label={`Switch wallet to ${name}`}
           onClick={() => wallet.changeNetwork()}
           display={compact ? 'icon' : 'all'}
           mode="strong"
diff --git a/packages/react-app/src/components/claim-list.tsx b/packages/react-app/src/components/claim-list.tsx
index 8bf4ebe9..8c2ee154 100644
--- a/packages/react-app/src/components/claim-list.tsx
+++ b/packages/react-app/src/components/claim-list.tsx
@@ -1,18 +1,20 @@
-import { Accordion, Box } from '@1hive/1hive-ui';
 import { ClaimModel } from 'src/models/claim.model';
 import styled from 'styled-components';
 import { GUpx } from 'src/utils/style.util';
 import { ENUM_TRANSACTION_STATUS } from 'src/constants';
 import { TokenAmountModel } from 'src/models/token-amount.model';
 import { QuestModel } from 'src/models/quest.model';
-import { useEffect, useMemo, useState } from 'react';
+import { Fragment, useEffect, useMemo, useState } from 'react';
 import { useTransactionContext } from 'src/contexts/transaction.context';
 import { useIsMountedRef } from 'src/hooks/use-mounted.hook';
 import { noop } from 'lodash';
+import { ThemeInterface } from 'src/styles/theme';
+import { useThemeContext } from 'src/contexts/theme.context';
 import { HelpTooltip } from './field-input/help-tooltip';
 import * as QuestService from '../services/quest.service';
 import Claim from './claim';
 import TextFieldInput from './field-input/text-field-input';
+import { CollapsableBlock } from './collapsable-block';
 
 // #region StyledComponents
 
@@ -33,8 +35,9 @@ const HeaderStyled = styled.h1`
   margin-left: ${GUpx(1)};
 `;
 
-const BoxStyled = styled(Box)`
+const ClaimsWrapperStyled = styled.div`
   display: flex;
+  flex-direction: column;
   justify-content: space-around;
 `;
 
@@ -42,6 +45,20 @@ const EvidenceWrapperStyled = styled.div`
   padding: ${GUpx(2)};
 `;
 
+const NoClaimBoxStyled = styled.div<{ theme: ThemeInterface }>`
+  background: ${({ theme }: any) => theme.surfaceUnder} !important;
+  padding: ${GUpx(2)};
+  border-radius: 8px;
+  width: 95%;
+  margin-left: ${GUpx(2)};
+  margin-top: ${GUpx(2)};
+  box-shadow: 10px 10px 15px 5px #00000029;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 100px;
+`;
+
 // #endregion
 
 type Props = {
@@ -61,52 +78,31 @@ export default function ClaimList({
   const [loadingClaim, setLoadingClaim] = useState(true);
   const { transaction } = useTransactionContext();
   const isMountedRef = useIsMountedRef();
+  const { currentTheme } = useThemeContext();
+
   const skeletonClaim = useMemo(() => {
     const fakeClaim = {} as ClaimModel;
-    return [
-      <Claim
-        isLoading
-        claim={fakeClaim}
-        questData={questData}
-        challengeDeposit={challengeDeposit}
-      />,
-      <EvidenceWrapperStyled>
-        <TextFieldInput id="evidence" isLoading />
-      </EvidenceWrapperStyled>,
-    ];
-  }, []);
-
-  const accordionItems = useMemo(() => {
-    const items = claims.map((claim: ClaimModel) => [
-      <Claim
-        claim={claim}
-        challengeDeposit={challengeDeposit}
-        questData={questData}
-        isLoading={isLoading}
-      />,
-      <EvidenceWrapperStyled>
-        <TextFieldInput
-          id="evidence"
-          value={claim.evidence}
-          isMarkDown
-          wide
-          label="Evidence of completion"
-        />
-        {claim.contactInformation && (
-          <TextFieldInput
-            id="contact"
-            value={claim.contactInformation}
-            wide
-            label="Contact information"
+    return (
+      <CollapsableBlock
+        hideState
+        visible
+        copyable={false}
+        collapsed
+        header={
+          <Claim
+            isLoading
+            claim={fakeClaim}
+            questData={questData}
+            challengeDeposit={challengeDeposit}
           />
-        )}
-      </EvidenceWrapperStyled>,
-    ]);
-    if (loadingClaim) {
-      items.unshift(skeletonClaim);
-    }
-    return items;
-  }, [claims, loadingClaim, questData.bounty, isLoading, challengeDeposit]);
+        }
+      >
+        <EvidenceWrapperStyled>
+          <TextFieldInput id="evidence" isLoading />
+        </EvidenceWrapperStyled>
+      </CollapsableBlock>
+    );
+  }, []);
 
   useEffect(() => {
     if (questData.address) {
@@ -161,11 +157,49 @@ export default function ClaimList({
         <HelpTooltip tooltip="A claim includes the proof of the quest's completion." />
       </ClaimHeaderStyled>
       {claims?.length || loadingClaim ? (
-        <Accordion items={accordionItems} className="accordion-fit-content" />
+        <ClaimsWrapperStyled>
+          {loadingClaim && skeletonClaim}
+          {claims.map((claim) => (
+            <Fragment key={claim.container?.id}>
+              <CollapsableBlock
+                hideState
+                visible
+                copyable={false}
+                collapsed
+                header={
+                  <Claim
+                    claim={claim}
+                    challengeDeposit={challengeDeposit}
+                    questData={questData}
+                    isLoading={isLoading}
+                  />
+                }
+              >
+                <EvidenceWrapperStyled>
+                  <TextFieldInput
+                    id="evidence"
+                    value={claim.evidence}
+                    isMarkDown
+                    wide
+                    label="Evidence of completion"
+                  />
+                  {claim.contactInformation && (
+                    <TextFieldInput
+                      id="contact"
+                      value={claim.contactInformation}
+                      wide
+                      label="Contact information"
+                    />
+                  )}
+                </EvidenceWrapperStyled>
+              </CollapsableBlock>
+            </Fragment>
+          ))}
+        </ClaimsWrapperStyled>
       ) : (
-        <BoxStyled>
-          <i>No claims</i>
-        </BoxStyled>
+        <ClaimsWrapperStyled>
+          <NoClaimBoxStyled theme={currentTheme}>No claims</NoClaimBoxStyled>
+        </ClaimsWrapperStyled>
       )}
     </WrapperStyled>
   );
diff --git a/packages/react-app/src/components/claim.tsx b/packages/react-app/src/components/claim.tsx
index 2b48a343..66599870 100644
--- a/packages/react-app/src/components/claim.tsx
+++ b/packages/react-app/src/components/claim.tsx
@@ -130,7 +130,7 @@ export default function Claim({ claim, isLoading, challengeDeposit, questData }:
       setActionButton(
         <>
           <ChallengeModal
-            claim={claim}
+            claim={{ ...claim, state }}
             challengeDeposit={challengeDeposit}
             onClose={onActionClose}
           />
diff --git a/packages/react-app/src/components/collapsable-block.tsx b/packages/react-app/src/components/collapsable-block.tsx
index 3d54c1fe..62756ef1 100644
--- a/packages/react-app/src/components/collapsable-block.tsx
+++ b/packages/react-app/src/components/collapsable-block.tsx
@@ -1,24 +1,28 @@
 /* eslint-disable react/destructuring-assignment */
 import { Button, IconDown, IconUp, IconCopy, useTheme } from '@1hive/1hive-ui';
-import { useEffect, useMemo, useState } from 'react';
-import styled from 'styled-components';
+import { ReactNode, useEffect, useMemo, useState } from 'react';
+import { ThemeInterface } from 'src/styles/theme';
+import styled, { css } from 'styled-components';
 import { useCopyToClipboard } from '../hooks/use-copy-to-clipboard.hook';
 import { GUpx } from '../utils/style.util';
+import { ConditionalWrapper } from './utils/util';
 
 // #region StyledComponents
 
 const IconColumnStyled = styled.div`
   display: flex;
   flex-direction: column;
-  margin-right: ${GUpx(1)};
+  padding: ${GUpx(1)};
 `;
 
-const CollapseButtonStyled = styled.a`
+const CollapseButtonStyled = styled(Button)`
   display: flex;
   cursor: pointer;
   text-decoration: none !important;
   user-select: none;
   flex-grow: 1;
+  height: fit-content;
+  padding: ${GUpx(1)};
 `;
 
 const CopyButtonStyled = styled(Button)`
@@ -30,32 +34,61 @@ const LineStyled = styled.div`
   justify-content: space-between;
   align-items: center;
   width: 100%;
+  height: fit-content;
 `;
 
 const ContentWrapperStyled = styled.div`
   padding-top: ${GUpx(1)};
 `;
 
-const LabelStyled = styled.span`
-  height: 100%;
-  color: ${({ theme }: any) => theme.link} !important;
+const WrapperStyled = styled.div<{ usePre: boolean | undefined; wide: boolean | undefined }>`
+  ${({ usePre, wide }) =>
+    css`
+      ${usePre ? 'pre {' : ''}
+      background: ${({ theme }: any) => theme.surfaceUnder} !important;
+      padding: ${GUpx(2)};
+      border-radius: 8px;
+      width: ${wide ? '100%' : '95%'};
+      margin-left: ${wide ? '0' : GUpx(2)};
+      margin-top: ${GUpx(2)};
+      box-shadow: 10px 10px 15px 5px #00000029;
+      ${usePre ? '}' : ''}
+    `}
+
+  margin-bottom: ${GUpx(1)};
+
+  a {
+    color: ${({ theme }: any) => theme.link};
+  }
+`;
+
+const HeaderWraperStyled = styled.div`
+  flex-grow: 1;
+  padding-left: 16px;
 `;
 
-const WrapperStyled = styled.pre`
-  background: ${({ theme }: any) => theme.surfaceUnder} !important;
+const CollapseButtonContentStyled = styled.div<{ theme: ThemeInterface }>`
+  color: ${({ theme }: any) => theme.link} !important;
+  display: flex;
+  align-items: center;
+  width: 100%;
 `;
 
 // #endregion
 
 type Props = {
   children: any;
-  label?: string;
+  header?: ReactNode;
   visible?: boolean;
   src?: string;
   width?: number;
   collapsed?: boolean;
   type?: 'image' | 'code' | 'default';
   alt?: string;
+  copyable?: boolean;
+  hideState?: boolean;
+  usePre?: boolean;
+  wide?: boolean;
 };
 
 export function CollapsableBlock(props: Props) {
@@ -76,38 +109,45 @@ export function CollapsableBlock(props: Props) {
   return (
     <>
       {props.visible && (
-        <WrapperStyled theme={theme}>
-          <LineStyled>
-            <CollapseButtonStyled onClick={() => setCollapsed(!collapsed)}>
-              <IconColumnStyled>
-                {collapsed ? (
-                  <>
-                    <IconUp size="tiny" />
-                    <IconDown size="tiny" />
-                  </>
-                ) : (
-                  <>
-                    <IconDown size="tiny" />
-                    <IconUp size="tiny" />
-                  </>
-                )}
-              </IconColumnStyled>
-              <LabelStyled theme={theme}>
-                {collapsed ? 'Show ' : 'Hide '}
-                {props.label}
-              </LabelStyled>
-            </CollapseButtonStyled>
-            {!collapsed && props.type !== 'image' && (
-              <CopyButtonStyled
-                onClick={() => copyCode(content)}
-                icon={<IconCopy />}
-                size="small"
-                label="Copy"
-                display="icon"
-              />
-            )}
-          </LineStyled>
-          {!collapsed && content ? <ContentWrapperStyled>{content}</ContentWrapperStyled> : <></>}
+        <WrapperStyled theme={theme} usePre={props.usePre} wide={props.wide}>
+          <ConditionalWrapper
+            condition={props.usePre}
+            wrapper={(children) => <pre>{children}</pre>}
+          >
+            <LineStyled>
+              <div className="btn-link">
+                <CollapseButtonStyled onClick={() => setCollapsed(!collapsed)}>
+                  <CollapseButtonContentStyled theme={theme}>
+                    <IconColumnStyled>
+                      {collapsed ? (
+                        <>
+                          <IconUp size="tiny" />
+                          <IconDown size="tiny" />
+                        </>
+                      ) : (
+                        <>
+                          <IconDown size="tiny" />
+                          <IconUp size="tiny" />
+                        </>
+                      )}
+                    </IconColumnStyled>
+                    {!props.hideState && (collapsed ? 'Show ' : 'Hide ')}
+                  </CollapseButtonContentStyled>
+                </CollapseButtonStyled>
+              </div>
+              <HeaderWraperStyled>{props.header}</HeaderWraperStyled>
+              {!collapsed && props.copyable && (
+                <CopyButtonStyled
+                  onClick={() => copyCode(content)}
+                  icon={<IconCopy />}
+                  size="small"
+                  label="Copy"
+                  display="icon"
+                />
+              )}
+            </LineStyled>
+            {!collapsed && content ? <ContentWrapperStyled>{content}</ContentWrapperStyled> : <></>}
+          </ConditionalWrapper>
         </WrapperStyled>
       )}
     </>
diff --git a/packages/react-app/src/components/field-input/amount-field-input.tsx b/packages/react-app/src/components/field-input/amount-field-input.tsx
index 6300795b..e7efe33a 100644
--- a/packages/react-app/src/components/field-input/amount-field-input.tsx
+++ b/packages/react-app/src/components/field-input/amount-field-input.tsx
@@ -53,6 +53,7 @@ interface AmountTokenWrapperStyledProps {
   isEdit?: boolean;
   wide?: boolean;
 }
+
 const AmountTokenWrapperStyled = styled.div<AmountTokenWrapperStyledProps>`
   display: flex;
   justify-content: flex-end;
@@ -73,6 +74,10 @@ const TokenAmountButtonStyled = styled(Button)<{ compact?: boolean }>`
   padding: 0 ${GUpx(1)};
   font-weight: bold;
   min-width: 0;
+
+  &:after {
+    border-radius: 4px !important;
+  }
 `;
 
 const AmountEllipsisWrapperStyled = styled.div`
@@ -145,7 +150,11 @@ const TokenAmountBadge = React.memo(
         mode="strong"
         size="mini"
         label={label}
-        title={`Copy : ${token.token}\n* This token don't have pair with our stable list (see footer)`}
+        title={`Copy : ${token.token}${
+          usdValue === undefined
+            ? `\n* This token don't have pair with our stable list (see footer)`
+            : ''
+        }`}
         onClick={onBadgeClick}
       />
     );
diff --git a/packages/react-app/src/components/field-input/text-field-input.tsx b/packages/react-app/src/components/field-input/text-field-input.tsx
index 8a12af36..71e3a7e7 100644
--- a/packages/react-app/src/components/field-input/text-field-input.tsx
+++ b/packages/react-app/src/components/field-input/text-field-input.tsx
@@ -99,6 +99,8 @@ export default function TextFieldInput({
                   label: 'block',
                   visible: blockVisibility !== 'hidden' ? 'true' : undefined,
                   collapsed: blockVisibility === 'collapsed' ? 'true' : undefined,
+                  copyable: true,
+                  usePre: true,
                 },
               },
               code: {
@@ -108,6 +110,8 @@ export default function TextFieldInput({
                   type: 'code',
                   visible: blockVisibility !== 'hidden' ? 'true' : undefined,
                   collapsed: blockVisibility === 'collapsed' ? 'true' : undefined,
+                  copyable: true,
+                  usePre: true,
                 },
               },
               img: {
diff --git a/packages/react-app/src/components/modals/challenge-modal.tsx b/packages/react-app/src/components/modals/challenge-modal.tsx
index b0b100c6..07030d59 100644
--- a/packages/react-app/src/components/modals/challenge-modal.tsx
+++ b/packages/react-app/src/components/modals/challenge-modal.tsx
@@ -5,7 +5,7 @@ import { useState, useRef, useEffect, useMemo } from 'react';
 import styled from 'styled-components';
 import { Formik, Form, FormikErrors } from 'formik';
 import { ClaimModel } from 'src/models/claim.model';
-import { ENUM, ENUM_TRANSACTION_STATUS } from 'src/constants';
+import { ENUM, ENUM_CLAIM_STATE, ENUM_TRANSACTION_STATUS } from 'src/constants';
 import { useTransactionContext } from 'src/contexts/transaction.context';
 import { ChallengeModel } from 'src/models/challenge.model';
 import { GUpx } from 'src/utils/style.util';
@@ -188,6 +188,7 @@ export default function ChallengeModal({ claim, challengeDeposit, onClose = noop
       }
     }
   };
+
   const validate = (values: ChallengeModel) => {
     const errors = {} as FormikErrors<ChallengeModel>;
     if (!values.reason) errors.reason = 'Challenge reason is required';
@@ -207,7 +208,12 @@ export default function ChallengeModal({ claim, challengeDeposit, onClose = noop
             onClick={() => setOpened(true)}
             label="Challenge"
             mode="negative"
-            title="Open challenge for this quest's claim"
+            title={
+              claim.state === ENUM_CLAIM_STATE.AvailableToExecute
+                ? 'Challenge period is over'
+                : "Open challenge for this quest's claim"
+            }
+            disabled={claim.state === ENUM_CLAIM_STATE.AvailableToExecute}
           />
         </OpenButtonWrapperStyled>
       }
diff --git a/packages/react-app/src/components/modals/create-quest-modal.tsx b/packages/react-app/src/components/modals/create-quest-modal.tsx
index 8d8cc20e..4956480d 100644
--- a/packages/react-app/src/components/modals/create-quest-modal.tsx
+++ b/packages/react-app/src/components/modals/create-quest-modal.tsx
@@ -134,6 +134,12 @@ export default function QuestModal({
     }
   }, [questMode]);
 
+  useEffect(() => {
+    if (opened) {
+      setShowPreview(false);
+    }
+  }, [opened]);
+
   const onOpenButtonClick = () => {
     setOpened(true);
   };
diff --git a/packages/react-app/src/components/modals/modal-base.tsx b/packages/react-app/src/components/modals/modal-base.tsx
index fbcbf4a6..65b2a58e 100644
--- a/packages/react-app/src/components/modals/modal-base.tsx
+++ b/packages/react-app/src/components/modals/modal-base.tsx
@@ -88,7 +88,7 @@ export default function ModalBase({
     ) {
       setTransaction(undefined);
     }
-  }, [transaction?.status, txFailed]);
+  }, [transaction?.status, txFailed, isOpen]);
 
   const escFunction = (e: any) => {
     const modalDom = document.getElementById(id) as HTMLElement;
diff --git a/packages/react-app/src/components/modals/resolve-challenge-modal.tsx b/packages/react-app/src/components/modals/resolve-challenge-modal.tsx
index 7163f6b2..81e4c16d 100644
--- a/packages/react-app/src/components/modals/resolve-challenge-modal.tsx
+++ b/packages/react-app/src/components/modals/resolve-challenge-modal.tsx
@@ -1,13 +1,5 @@
 /* eslint-disable no-nested-ternary */
-import {
-  Button,
-  IconFlag,
-  Accordion,
-  IdentityBadge,
-  Info,
-  Link,
-  IconCaution,
-} from '@1hive/1hive-ui';
+import { Button, IconFlag, IdentityBadge, Info, Link, IconCaution } from '@1hive/1hive-ui';
 import { noop, uniqueId } from 'lodash-es';
 import { useState, useEffect, Fragment, useMemo } from 'react';
 import styled from 'styled-components';
@@ -35,6 +27,7 @@ import { Outset } from '../utils/spacer-util';
 import { DisputeModel } from '../../models/dispute.model';
 import TextFieldInput from '../field-input/text-field-input';
 import { HelpTooltip } from '../field-input/help-tooltip';
+import { CollapsableBlock } from '../collapsable-block';
 
 // #region StyledComponents
 
@@ -57,7 +50,7 @@ const OpenButtonWrapperStyled = styled.div`
 `;
 
 const LabelStyled = styled.span`
-  margin-left: ${GUpx(1)};
+  margin-left: ${GUpx(2)};
 `;
 
 const FinalRulingStyled = styled.span`
@@ -112,12 +105,12 @@ export default function ResolveChallengeModal({ claim, onClose = noop }: Props)
   }, []);
 
   useEffect(() => {
-    const fetchChallengeAndDispute = async (container: ContainerModel, retryCount: number = 2) => {
+    const fetchChallengeAndDispute = async (container: ContainerModel, retryCount: number = 5) => {
       const challengeResult = await QuestService.fetchChallenge(container);
       if (!isMountedRef.current) return;
       if (!challengeResult) {
         if (retryCount > 0) {
-          sleep(1000);
+          await sleep(1000);
           await fetchChallengeAndDispute(container, retryCount - 1);
         } else {
           throw new Error(`Failed to fetch challenge with container id ${container.id}`);
@@ -324,24 +317,38 @@ export default function ResolveChallengeModal({ claim, onClose = noop }: Props)
           {!challenge || !evidence ? (
             <Skeleton />
           ) : (
-            <Accordion
-              items={[
-                [
+            <>
+              <CollapsableBlock
+                hideState
+                visible
+                copyable={false}
+                collapsed
+                wide
+                header={
                   <>
                     {player}
                     <LabelStyled>Player evidence of completion</LabelStyled>
-                  </>,
-                  <TextFieldInput id="evidenceOfCompletion" value={evidence} isMarkDown />,
-                ],
-                [
+                  </>
+                }
+              >
+                <TextFieldInput id="evidenceOfCompletion" value={evidence} isMarkDown />
+              </CollapsableBlock>
+              <CollapsableBlock
+                hideState
+                visible
+                copyable={false}
+                collapsed
+                wide
+                header={
                   <>
                     {challenger}
                     <LabelStyled>Challenge reason</LabelStyled>
-                  </>,
-                  <TextFieldInput id="challengeReason" value={challenge.reason} isMarkDown />,
-                ],
-              ]}
-            />
+                  </>
+                }
+              >
+                <TextFieldInput id="challengeReason" value={challenge.reason} isMarkDown />
+              </CollapsableBlock>
+            </>
           )}
           {finalRuling}
         </>
diff --git a/packages/react-app/src/components/utils/util.tsx b/packages/react-app/src/components/utils/util.tsx
index f80ce600..5720158d 100644
--- a/packages/react-app/src/components/utils/util.tsx
+++ b/packages/react-app/src/components/utils/util.tsx
@@ -1,7 +1,7 @@
 import { ReactNode } from 'react';
 
 type Props = {
-  condition: boolean;
+  condition?: boolean;
   wrapper: (_children: ReactNode) => ReactNode;
   children: ReactNode;
 };
diff --git a/packages/react-app/src/services/quest.service.ts b/packages/react-app/src/services/quest.service.ts
index 0db4fe50..27fe5f00 100644
--- a/packages/react-app/src/services/quest.service.ts
+++ b/packages/react-app/src/services/quest.service.ts
@@ -202,9 +202,11 @@ async function generateScheduleContainer(
     lastBlockTimestamp +
     erc3000Config.executionDelay +
     (extraDelaySec || DEFAULT_CLAIM_EXECUTION_DELAY_MS / 1000); // Add 15 minutes by default
-  const claimInfoIpfsHash = await pushObjectToIpfs(
-    `${claimData.evidence}\nContactInformation: ${claimData.contactInformation}`,
-  );
+  let { evidence } = claimData;
+  if (claimData.contactInformation) {
+    evidence += `\nContactInformation: ${claimData.contactInformation}`;
+  }
+  const claimInfoIpfsHash = await pushObjectToIpfs(evidence);
 
   const claimCall = encodeClaimAction(claimData, claimInfoIpfsHash);
 
diff --git a/packages/react-app/src/styles/style.scss b/packages/react-app/src/styles/style.scss
index df7f1e96..cbdd5fb1 100644
--- a/packages/react-app/src/styles/style.scss
+++ b/packages/react-app/src/styles/style.scss
@@ -45,7 +45,7 @@ button {
   }
 }
 
-.bWAZMD {
+.bNEUIQ[style='height: 367px;'] + .bWAZMD {
   height: fit-content !important;
 }
 
@@ -98,7 +98,6 @@ button {
 .btn-link button {
   padding: 0;
   margin-top: 8px;
-  padding-right: 8px;
   background: transparent;
   border: none;
   box-shadow: none;
@@ -143,3 +142,7 @@ button {
 *::-webkit-scrollbar-corner {
   background-color: #00000000;
 }
+
+button:focus:after {
+  margin: -4px !important;
+}