diff --git a/next.config.js b/next.config.js
index 743d89ee5f..4572a13ba2 100644
--- a/next.config.js
+++ b/next.config.js
@@ -43,6 +43,10 @@ const nextConfig = {
                   name: 'removeDimensions',
                   active: true,
                 },
+                {
+                  name: 'prefixIds',
+                  active: true,
+                },
               ],
             },
           },
diff --git a/package-lock.json b/package-lock.json
index 1533138342..c4b27a97e0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "matters-web",
-  "version": "4.13.2",
+  "version": "4.13.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "matters-web",
-      "version": "4.13.2",
+      "version": "4.13.4",
       "license": "Apache-2.0",
       "dependencies": {
         "@apollo/react-common": "^3.1.3",
@@ -14,7 +14,7 @@
         "@apollo/react-ssr": "^3.1.3",
         "@ensdomains/content-hash": "^2.5.7",
         "@matters/apollo-upload-client": "^11.1.0",
-        "@matters/matters-editor": "^0.1.27-alpha.1",
+        "@matters/matters-editor": "^0.1.27-alpha.3",
         "@next/bundle-analyzer": "^13.1.1",
         "@reach/alert": "^0.17.0",
         "@reach/dialog": "^0.17.0",
@@ -6459,9 +6459,9 @@
       }
     },
     "node_modules/@matters/matters-editor": {
-      "version": "0.1.27-alpha.1",
-      "resolved": "https://registry.npmjs.org/@matters/matters-editor/-/matters-editor-0.1.27-alpha.1.tgz",
-      "integrity": "sha512-9Uc8dE/vy1iKqbr8zklaX/IQiqT6YsdK5eAZ0W5ATOXVcSYmiNuZ9Xt+rLuFd8SsZmiEf8cZw9a8nh+2N3o7kg==",
+      "version": "0.1.27-alpha.3",
+      "resolved": "https://registry.npmjs.org/@matters/matters-editor/-/matters-editor-0.1.27-alpha.3.tgz",
+      "integrity": "sha512-mOfHXg9SNDzGf3Td+3YBqqGP3rjQclx0nijZB+hHCEhQMR+AgLd2C+6HDBxtB1WYCidMAiLrK9WA7ewttwEHBg==",
       "dependencies": {
         "autosize": "^4.0.2",
         "classnames": "^2.2.6",
@@ -47760,9 +47760,9 @@
       }
     },
     "@matters/matters-editor": {
-      "version": "0.1.27-alpha.1",
-      "resolved": "https://registry.npmjs.org/@matters/matters-editor/-/matters-editor-0.1.27-alpha.1.tgz",
-      "integrity": "sha512-9Uc8dE/vy1iKqbr8zklaX/IQiqT6YsdK5eAZ0W5ATOXVcSYmiNuZ9Xt+rLuFd8SsZmiEf8cZw9a8nh+2N3o7kg==",
+      "version": "0.1.27-alpha.3",
+      "resolved": "https://registry.npmjs.org/@matters/matters-editor/-/matters-editor-0.1.27-alpha.3.tgz",
+      "integrity": "sha512-mOfHXg9SNDzGf3Td+3YBqqGP3rjQclx0nijZB+hHCEhQMR+AgLd2C+6HDBxtB1WYCidMAiLrK9WA7ewttwEHBg==",
       "requires": {
         "autosize": "^4.0.2",
         "classnames": "^2.2.6",
diff --git a/package.json b/package.json
index 2d04a3b7c9..1becb1ab65 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matters-web",
-  "version": "4.13.3",
+  "version": "4.13.5",
   "description": "codebase of Matters' website",
   "sideEffects": false,
   "author": "Matters <hi@matters.news>",
@@ -36,7 +36,7 @@
     "@apollo/react-ssr": "^3.1.3",
     "@ensdomains/content-hash": "^2.5.7",
     "@matters/apollo-upload-client": "^11.1.0",
-    "@matters/matters-editor": "^0.1.27-alpha.1",
+    "@matters/matters-editor": "^0.1.27-alpha.3",
     "@next/bundle-analyzer": "^13.1.1",
     "@reach/alert": "^0.17.0",
     "@reach/dialog": "^0.17.0",
diff --git a/src/common/utils/number/index.ts b/src/common/utils/number/index.ts
index 474bcef18f..802ab682d9 100644
--- a/src/common/utils/number/index.ts
+++ b/src/common/utils/number/index.ts
@@ -9,7 +9,7 @@ export const numPrefix = (num: number | string) => {
   return parsedNum > 0 ? `+${num}` : num
 }
 
-export const numAbbr = (num: number, decPlaces: number = 2) =>
+export const numAbbr = (num: number, decPlaces: number = 1) =>
   abbr(num, decPlaces)
 
 export const numRound = (num: number, decPlaces: number = 2) => {
diff --git a/src/components/Dialogs/LikeCoinDialog/SetupLikeCoin/Binding/index.tsx b/src/components/Dialogs/LikeCoinDialog/SetupLikeCoin/Binding/index.tsx
index 0923685e47..885ee1443b 100644
--- a/src/components/Dialogs/LikeCoinDialog/SetupLikeCoin/Binding/index.tsx
+++ b/src/components/Dialogs/LikeCoinDialog/SetupLikeCoin/Binding/index.tsx
@@ -1,6 +1,6 @@
 import { useQuery } from '@apollo/react-hooks'
 import gql from 'graphql-tag'
-import { useEffect, useState } from 'react'
+import { useEffect } from 'react'
 
 import { Dialog, Spinner, Translate } from '~/components'
 import { ViewerLikerIdQuery } from '~/gql/graphql'
@@ -23,15 +23,22 @@ const VIEWER_LIKER_ID = gql`
 `
 
 const Binding: React.FC<Props> = ({ prevStep, nextStep, windowRef }) => {
-  const [polling, setPolling] = useState(true)
-  const { data, error } = useQuery<ViewerLikerIdQuery>(VIEWER_LIKER_ID, {
-    pollInterval: polling ? 1000 : undefined,
-    errorPolicy: 'none',
-    fetchPolicy: 'network-only',
-    skip: typeof window === 'undefined',
-  })
+  const { data, error, startPolling, stopPolling } =
+    useQuery<ViewerLikerIdQuery>(VIEWER_LIKER_ID, {
+      errorPolicy: 'none',
+      fetchPolicy: 'network-only',
+      skip: typeof window === 'undefined',
+    })
   const likerId = data?.viewer?.liker.likerId
 
+  useEffect(() => {
+    startPolling(1000)
+
+    return () => {
+      stopPolling()
+    }
+  }, [])
+
   useEffect(() => {
     if (likerId) {
       nextStep()
@@ -44,7 +51,7 @@ const Binding: React.FC<Props> = ({ prevStep, nextStep, windowRef }) => {
     }
 
     if (error) {
-      setPolling(false)
+      stopPolling()
     }
   })
 
diff --git a/src/components/Dialogs/TagEditorDialog/List/index.tsx b/src/components/Dialogs/TagEditorDialog/List/index.tsx
index 98b40f86c3..548a54581f 100644
--- a/src/components/Dialogs/TagEditorDialog/List/index.tsx
+++ b/src/components/Dialogs/TagEditorDialog/List/index.tsx
@@ -144,7 +144,7 @@ const TagEditorList = ({ id, closeDialog, toAddStep, toRemoveStep }: Props) => {
             <Translate
               zh_hant="協作者可以與你共同管理精選"
               zh_hans="协作者可以与你共同管理精选"
-              en="collaborator can manage selected feed with you"
+              en="Collaborator can manage selected feed with you."
             />
             <br />
             {(isHavingNoneEditors || isReachingLimit) && (
@@ -152,9 +152,14 @@ const TagEditorList = ({ id, closeDialog, toAddStep, toRemoveStep }: Props) => {
                 <Translate
                   zh_hant="每個標籤最多添加"
                   zh_hans="每个标签最多添加"
-                  en="every tag can have maximum"
+                  en="Every tag can have maximum"
+                />
+                <span className="count"> 4 </span>
+                <Translate
+                  zh_hant="名協作者"
+                  zh_hans="名协作者"
+                  en="collaborators."
                 />
-                <span className="count">{' 4 '}</span>
               </>
             )}
             {isAllowAdd && isHavingEditors && (
@@ -162,16 +167,16 @@ const TagEditorList = ({ id, closeDialog, toAddStep, toRemoveStep }: Props) => {
                 <Translate
                   zh_hant="你還可以添加"
                   zh_hans="你还可以添加"
-                  en="you can add"
+                  en="You can add"
                 />
                 <span className="count"> {4 - count} </span>
+                <Translate
+                  zh_hant="名協作者"
+                  zh_hans="名协作者"
+                  en="more collaborators."
+                />
               </>
             )}
-            <Translate
-              zh_hant="名協作者"
-              zh_hans="名协作者"
-              en="more collaborators"
-            />
           </p>
         </Dialog.Message>
       </Dialog.Content>
@@ -186,7 +191,7 @@ const TagEditorList = ({ id, closeDialog, toAddStep, toRemoveStep }: Props) => {
             <Translate
               zh_hant="新增協作者"
               zh_hans="新增协作者"
-              en="add collaborator"
+              en="Add collaborator"
             />
           </Dialog.Footer.Button>
         </Dialog.Footer>
diff --git a/src/components/Forms/PaymentForm/ConnectStripeAccount/Onboarding.tsx b/src/components/Forms/PaymentForm/ConnectStripeAccount/Onboarding.tsx
index 9ac2f3f4b7..d1a5b0bb9d 100644
--- a/src/components/Forms/PaymentForm/ConnectStripeAccount/Onboarding.tsx
+++ b/src/components/Forms/PaymentForm/ConnectStripeAccount/Onboarding.tsx
@@ -1,6 +1,6 @@
 import { useQuery } from '@apollo/react-hooks'
 import gql from 'graphql-tag'
-import { useState } from 'react'
+import { useEffect, useState } from 'react'
 
 import { Dialog, Spinner, Translate } from '~/components'
 import { ViewerStripeAccountQuery } from '~/gql/graphql'
@@ -25,17 +25,24 @@ const VIEWER_STRIPE_ACCOUNT = gql`
 
 const Onboarding: React.FC<Props> = ({ nextStep }) => {
   const [polling, setPolling] = useState(true)
-  const { data, error } = useQuery<ViewerStripeAccountQuery>(
-    VIEWER_STRIPE_ACCOUNT,
-    {
-      pollInterval: polling ? 1000 : undefined,
+  const { data, error, startPolling, stopPolling } =
+    useQuery<ViewerStripeAccountQuery>(VIEWER_STRIPE_ACCOUNT, {
       errorPolicy: 'none',
       fetchPolicy: 'network-only',
       skip: typeof window === 'undefined',
-    }
-  )
+    })
   const stripeAccount = data?.viewer?.wallet.stripeAccount?.id
 
+  useEffect(() => {
+    if (polling) {
+      startPolling(1000)
+    }
+
+    return () => {
+      stopPolling()
+    }
+  }, [polling])
+
   if (stripeAccount) {
     nextStep()
     return null
diff --git a/src/components/Forms/PaymentForm/Processing/index.tsx b/src/components/Forms/PaymentForm/Processing/index.tsx
index 3eaace2f3f..bc5d271011 100644
--- a/src/components/Forms/PaymentForm/Processing/index.tsx
+++ b/src/components/Forms/PaymentForm/Processing/index.tsx
@@ -2,7 +2,7 @@ import { useQuery } from '@apollo/react-hooks'
 import { ethers } from 'ethers'
 import gql from 'graphql-tag'
 import _get from 'lodash/get'
-import { useContext, useEffect, useState } from 'react'
+import { useContext, useEffect } from 'react'
 import { useAccount, useContractWrite, useNetwork } from 'wagmi'
 
 import {
@@ -76,14 +76,13 @@ const OthersProcessingForm: React.FC<Props> = ({
   closeDialog,
   windowRef,
 }) => {
-  const [polling, setPolling] = useState(true)
-  const { data, error } = useQuery<ViewerTxStateQuery>(VIEWER_TX_STATE, {
-    variables: { id: txId },
-    pollInterval: polling ? 1000 : undefined,
-    errorPolicy: 'none',
-    fetchPolicy: 'network-only',
-    skip: typeof window === 'undefined',
-  })
+  const { data, error, startPolling, stopPolling } =
+    useQuery<ViewerTxStateQuery>(VIEWER_TX_STATE, {
+      variables: { id: txId },
+      errorPolicy: 'none',
+      fetchPolicy: 'network-only',
+      skip: typeof window === 'undefined',
+    })
   const txState = _get(data, 'viewer.wallet.transactions.edges.0.node.state')
 
   const succeededFn = () => {
@@ -101,19 +100,27 @@ const OthersProcessingForm: React.FC<Props> = ({
     }
   }
 
-  if (txState === 'succeeded') {
-    if (currency === CURRENCY.HKD) {
-      setTimeout(() => {
-        succeededFn()
-      }, 3 * 1000)
+  useEffect(() => {
+    if (error) {
+      stopPolling()
     } else {
-      succeededFn()
+      startPolling(1000)
     }
-  }
 
-  if (error) {
-    setPolling(false)
-  }
+    return () => {}
+  }, [error])
+
+  useEffect(() => {
+    if (txState === 'succeeded') {
+      if (currency === CURRENCY.HKD) {
+        setTimeout(() => {
+          succeededFn()
+        }, 3 * 1000)
+      } else {
+        succeededFn()
+      }
+    }
+  }, [txState])
 
   return (
     <>
diff --git a/src/components/Forms/PaymentForm/SubscribeCircle/Processing/index.tsx b/src/components/Forms/PaymentForm/SubscribeCircle/Processing/index.tsx
index a70c07633a..118371b570 100644
--- a/src/components/Forms/PaymentForm/SubscribeCircle/Processing/index.tsx
+++ b/src/components/Forms/PaymentForm/SubscribeCircle/Processing/index.tsx
@@ -1,6 +1,5 @@
 import { useQuery } from '@apollo/react-hooks'
-import _get from 'lodash/get'
-import { useState } from 'react'
+import { useEffect } from 'react'
 
 import { Dialog, Spinner, Translate } from '~/components'
 import { ViewerCircleStateQuery } from '~/gql/graphql'
@@ -13,27 +12,30 @@ interface Props {
 }
 
 const Processing: React.FC<Props> = ({ circleName, nextStep }) => {
-  const [polling, setPolling] = useState(true)
-  const { data, error } = useQuery<ViewerCircleStateQuery>(
-    VIEWER_CIRLCE_STATE,
-    {
+  const { data, error, startPolling, stopPolling } =
+    useQuery<ViewerCircleStateQuery>(VIEWER_CIRLCE_STATE, {
       variables: { name: circleName },
-      pollInterval: polling ? 1000 : undefined,
       errorPolicy: 'none',
       fetchPolicy: 'network-only',
       skip: typeof window === 'undefined',
-    }
-  )
+    })
   const isMember = data?.circle?.isMember
 
-  if (isMember) {
-    nextStep()
-    return null
-  }
+  useEffect(() => {
+    if (error) {
+      stopPolling()
+    } else {
+      startPolling(1000)
+    }
 
-  if (error) {
-    setPolling(false)
-  }
+    return () => {}
+  }, [error])
+
+  useEffect(() => {
+    if (isMember) {
+      nextStep()
+    }
+  }, [isMember])
 
   return (
     <Dialog.Message type={error ? 'error' : undefined} spacing="md">
diff --git a/src/components/Head/index.tsx b/src/components/Head/index.tsx
index 6a87c9429e..2666105fe3 100644
--- a/src/components/Head/index.tsx
+++ b/src/components/Head/index.tsx
@@ -1,5 +1,4 @@
 import NextHead from 'next/head'
-import NextScript from 'next/script'
 import { useContext } from 'react'
 
 import IMAGE_APPLE_TOUCH_ICON from '@/public/static/apple-touch-icon.png'
@@ -219,13 +218,6 @@ export const Head: React.FC<HeadProps> = (props) => {
           key="ld-json-data"
         />
       )}
-
-      <NextScript
-        async
-        src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=ca-pub-5129054622209245"
-        strategy="lazyOnload"
-        crossOrigin="anonymous"
-      />
     </NextHead>
   )
 }
diff --git a/src/components/Notice/NoticeActorAvatar.tsx b/src/components/Notice/NoticeActorAvatar.tsx
index 377032799d..b92f4cc344 100644
--- a/src/components/Notice/NoticeActorAvatar.tsx
+++ b/src/components/Notice/NoticeActorAvatar.tsx
@@ -23,7 +23,9 @@ const NoticeActorAvatar = ({
 
   return (
     <Link {...path}>
-      <Avatar user={user} size={size} />
+      <a>
+        <Avatar user={user} size={size} />
+      </a>
     </Link>
   )
 }
diff --git a/src/components/Notice/NoticeActorName.tsx b/src/components/Notice/NoticeActorName.tsx
index fc9474d4db..148becb01e 100644
--- a/src/components/Notice/NoticeActorName.tsx
+++ b/src/components/Notice/NoticeActorName.tsx
@@ -18,7 +18,11 @@ const NoticeActorName = ({
     userName: user.userName || '',
   })
 
-  return <Link {...path}>{user.displayName}</Link>
+  return (
+    <Link {...path}>
+      <a>{user.displayName}</a>
+    </Link>
+  )
 }
 
 NoticeActorName.fragments = {
diff --git a/src/components/Notice/NoticeArticleTitle.tsx b/src/components/Notice/NoticeArticleTitle.tsx
index a06e143af4..7397ae5f11 100644
--- a/src/components/Notice/NoticeArticleTitle.tsx
+++ b/src/components/Notice/NoticeArticleTitle.tsx
@@ -22,7 +22,11 @@ const NoticeArticleTitle = ({
   })
 
   if (!isBlock) {
-    return <Link {...path}>{article.title}</Link>
+    return (
+      <Link {...path}>
+        <a>{article.title}</a>
+      </Link>
+    )
   }
 
   return <ArticleDigestTitle article={article} textSize="md-s" />
diff --git a/src/components/Notice/NoticeCircleName.tsx b/src/components/Notice/NoticeCircleName.tsx
index ec1c468f41..aeb3042785 100644
--- a/src/components/Notice/NoticeCircleName.tsx
+++ b/src/components/Notice/NoticeCircleName.tsx
@@ -20,7 +20,11 @@ const NoticeCircleName = ({
     circle,
   })
 
-  return <Link {...(path || circlePath)}>{circle.displayName}</Link>
+  return (
+    <Link {...(path || circlePath)}>
+      <a>{circle.displayName}</a>
+    </Link>
+  )
 }
 
 NoticeCircleName.fragments = {
diff --git a/src/components/TagDigest/Feed/styles.css b/src/components/TagDigest/Feed/styles.css
index fbbab126a9..794bf010ae 100644
--- a/src/components/TagDigest/Feed/styles.css
+++ b/src/components/TagDigest/Feed/styles.css
@@ -8,6 +8,7 @@ header {
 
 .nums {
   display: inline-flex;
+  flex-shrink: 0;
 
   & :global(> * + *) {
     margin-left: var(--spacing-x-tight);
diff --git a/src/components/TagDigest/Sidebar/styles.css b/src/components/TagDigest/Sidebar/styles.css
index b3a06830d1..3a0759ed6c 100644
--- a/src/components/TagDigest/Sidebar/styles.css
+++ b/src/components/TagDigest/Sidebar/styles.css
@@ -36,7 +36,7 @@
   margin-top: var(--spacing-x-tight);
 
   & :global(> *) {
-    width: 3.625rem;
+    width: 4rem;
   }
 
   & :global(> * + *) {
diff --git a/src/pages/_document.tsx b/src/pages/_document.tsx
index eed1389498..47afefb53f 100644
--- a/src/pages/_document.tsx
+++ b/src/pages/_document.tsx
@@ -1,4 +1,5 @@
 import Document, { Head, Html, Main, NextScript } from 'next/document'
+import Script from 'next/script'
 import React from 'react'
 
 import { CSP_POLICY } from '~/common/enums'
@@ -18,6 +19,13 @@ class MattersDocument extends Document<MattersDocumentProps> {
         <body>
           <Main />
           <NextScript />
+
+          <Script
+            async
+            src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=ca-pub-5129054622209245"
+            strategy="lazyOnload"
+            crossOrigin="anonymous"
+          />
         </body>
       </Html>
     )
diff --git a/src/views/ArticleDetail/EditMode/Header/index.tsx b/src/views/ArticleDetail/EditMode/Header/index.tsx
index d5f3b9281d..b5b2b504ac 100644
--- a/src/views/ArticleDetail/EditMode/Header/index.tsx
+++ b/src/views/ArticleDetail/EditMode/Header/index.tsx
@@ -52,7 +52,7 @@ const EditModeHeader = ({
   const diff = measureDiffs(initText || '', currText || '') || 0
   const diffCount = `${diff}`.padStart(2, '0')
   const isOverDiffLimit = diff > MAX_ARTICLE_REVISION_DIFF
-  const isRevised = diff > 0
+  const isContentRevised = diff > 0
 
   // save or republish
   const { tags, collection, circle, accessType, license } = restProps
@@ -69,13 +69,13 @@ const EditModeHeader = ({
           circle: circle ? circle.id : null,
           accessType,
           license,
-          ...(isRevised ? { content } : {}),
+          ...(isContentRevised ? { content } : {}),
           first: null,
           iscnPublish: restProps.iscnPublish,
         },
       })
 
-      if (!isRevised) {
+      if (!isContentRevised) {
         onSaved()
       }
     } catch (e) {
@@ -83,7 +83,7 @@ const EditModeHeader = ({
         new CustomEvent(ADD_TOAST, {
           detail: {
             color: 'red',
-            content: isRevised ? (
+            content: isContentRevised ? (
               <Translate
                 zh_hant="發布失敗"
                 zh_hans="發布失敗"
@@ -149,7 +149,7 @@ const EditModeHeader = ({
         saving={loading}
         disabled={loading}
         confirmButtonText={
-          isRevised ? (
+          isContentRevised ? (
             <Translate zh_hant="立即發布" zh_hans="立即发布" en="Publish" />
           ) : (
             <Translate
@@ -160,7 +160,7 @@ const EditModeHeader = ({
           )
         }
         cancelButtonText={<Translate id="cancel" />}
-        onConfirm={isRevised ? undefined : onSave}
+        onConfirm={isContentRevised ? undefined : onSave}
         ConfirmStepContent={ConfirmStepContent}
       >
         {({ openDialog: openEditorSettingsDialog }) => (
diff --git a/src/views/ArticleDetail/EditMode/PublishState/PendingState.tsx b/src/views/ArticleDetail/EditMode/PublishState/PendingState.tsx
index 0586d7a355..ef1cb68484 100644
--- a/src/views/ArticleDetail/EditMode/PublishState/PendingState.tsx
+++ b/src/views/ArticleDetail/EditMode/PublishState/PendingState.tsx
@@ -1,4 +1,5 @@
 import { useQuery } from '@apollo/react-hooks'
+import { useEffect } from 'react'
 
 import { Toast, Translate } from '~/components'
 import { EditModeArticleDraftsQuery, EditModeArticleQuery } from '~/gql/graphql'
@@ -16,13 +17,23 @@ const PendingState = ({
   >[0]
   id: string
 }) => {
-  useQuery<EditModeArticleDraftsQuery>(EDIT_MODE_ARTICLE_DRAFTS, {
-    variables: { id },
-    pollInterval: 1000 * 2,
-    errorPolicy: 'none',
-    fetchPolicy: 'network-only',
-    skip: typeof window === 'undefined',
-  })
+  const { startPolling, stopPolling } = useQuery<EditModeArticleDraftsQuery>(
+    EDIT_MODE_ARTICLE_DRAFTS,
+    {
+      variables: { id },
+      errorPolicy: 'none',
+      fetchPolicy: 'network-only',
+      skip: typeof window === 'undefined',
+    }
+  )
+
+  useEffect(() => {
+    startPolling(1000 * 2)
+
+    return () => {
+      stopPolling()
+    }
+  }, [])
 
   return (
     <Toast.Instance
diff --git a/src/views/ArticleDetail/EditMode/PublishState/PublishedState.tsx b/src/views/ArticleDetail/EditMode/PublishState/PublishedState.tsx
index 9de2a36ca5..fbc89b0638 100644
--- a/src/views/ArticleDetail/EditMode/PublishState/PublishedState.tsx
+++ b/src/views/ArticleDetail/EditMode/PublishState/PublishedState.tsx
@@ -70,7 +70,7 @@ const PublishedState = ({ article, draft, cancel }: Props) => {
         <Translate
           zh_hant="修訂作品已發佈"
           zh_hans="修订作品已发布"
-          en="Your work has been republished"
+          en="Article republished"
         />
       }
       footerButtons={
@@ -83,7 +83,7 @@ const PublishedState = ({ article, draft, cancel }: Props) => {
           <Translate
             zh_hant="查看修訂作品"
             zh_hans="查看修订作品"
-            en="view republished work"
+            en="View republished article"
           />
         </Dialog.Footer.Button>
       }
diff --git a/src/views/ArticleDetail/EditMode/PublishState/index.tsx b/src/views/ArticleDetail/EditMode/PublishState/index.tsx
index 6cc0ac07b4..aeca35d7a3 100644
--- a/src/views/ArticleDetail/EditMode/PublishState/index.tsx
+++ b/src/views/ArticleDetail/EditMode/PublishState/index.tsx
@@ -35,7 +35,7 @@ const PublishState = ({
 }: Props) => {
   const isPending = draft.publishState === 'pending'
   const isPublished = draft.publishState === 'published'
-  const isValidHash = typeof draft.mediaHash === 'string' && draft.mediaHash
+  const isValidHash = typeof draft.mediaHash === 'string' && !!draft.mediaHash
 
   if (!isPending && !isPublished) {
     return null
diff --git a/src/views/ArticleDetail/SupportWidget/styles.css b/src/views/ArticleDetail/SupportWidget/styles.css
index 35fb82e4fd..ba969f7432 100644
--- a/src/views/ArticleDetail/SupportWidget/styles.css
+++ b/src/views/ArticleDetail/SupportWidget/styles.css
@@ -46,11 +46,13 @@
 
     & .transaction-left {
       display: inline-flex;
-      border-bottom: 1px solid transparent;
+      line-height: 1.25rem;
     }
 
     & .transaction-button {
       display: inline-flex;
+      padding-top: 2px;
+      padding-bottom: 1px;
       margin-left: var(--spacing-xx-tight);
       border-bottom: 1px solid var(--color-matters-gold);
     }
diff --git a/src/views/ArticleDetail/index.tsx b/src/views/ArticleDetail/index.tsx
index 9be97162c6..b35bed5f93 100644
--- a/src/views/ArticleDetail/index.tsx
+++ b/src/views/ArticleDetail/index.tsx
@@ -480,9 +480,10 @@ const ArticleDetail = ({
 
   const onEditSaved = async () => {
     setEditMode(false)
+    exitEditMode()
+
     await refetchPublic()
     loadPrivate()
-    exitEditMode()
   }
 
   useEffect(() => {
diff --git a/src/views/Circle/Profile/AddCircleArticle/Dialog/index.tsx b/src/views/Circle/Profile/AddCircleArticle/Dialog/index.tsx
index 3a9093feaf..ea2159dfe3 100644
--- a/src/views/Circle/Profile/AddCircleArticle/Dialog/index.tsx
+++ b/src/views/Circle/Profile/AddCircleArticle/Dialog/index.tsx
@@ -102,7 +102,7 @@ const AddCircleArticleDialog = ({
     <>
       {children({ openDialog })}
 
-      <Dialog isOpen={show} onDismiss={closeDialog} size="sm" fixedHeight>
+      <Dialog isOpen={show} onDismiss={closeDialog} fixedHeight>
         {isSelect && (
           <DynamicSearchSelectForm
             title="addArticles"
diff --git a/src/views/Me/DraftDetail/PublishState/PendingState.tsx b/src/views/Me/DraftDetail/PublishState/PendingState.tsx
index dd025fd9ce..3ef9c01252 100644
--- a/src/views/Me/DraftDetail/PublishState/PendingState.tsx
+++ b/src/views/Me/DraftDetail/PublishState/PendingState.tsx
@@ -1,4 +1,5 @@
 import { useQuery } from '@apollo/react-hooks'
+import { useEffect } from 'react'
 
 import { Toast, Translate } from '~/components'
 import DRAFT_PUBLISH_STATE from '~/components/GQL/queries/draftPublishState'
@@ -8,13 +9,23 @@ import {
 } from '~/gql/graphql'
 
 const PendingState = ({ draft }: { draft: PublishStateDraftFragment }) => {
-  useQuery<DraftPublishStateQuery>(DRAFT_PUBLISH_STATE, {
-    variables: { id: draft.id },
-    pollInterval: 1000 * 2,
-    errorPolicy: 'none',
-    fetchPolicy: 'network-only',
-    skip: typeof window === 'undefined',
-  })
+  const { startPolling, stopPolling } = useQuery<DraftPublishStateQuery>(
+    DRAFT_PUBLISH_STATE,
+    {
+      variables: { id: draft.id },
+      errorPolicy: 'none',
+      fetchPolicy: 'network-only',
+      skip: typeof window === 'undefined',
+    }
+  )
+
+  useEffect(() => {
+    startPolling(1000 * 2)
+
+    return () => {
+      stopPolling()
+    }
+  }, [])
 
   return (
     <Toast.Instance
diff --git a/src/views/TagDetail/DropdownActions/index.tsx b/src/views/TagDetail/DropdownActions/index.tsx
index 5735158b9e..4aefc9c394 100644
--- a/src/views/TagDetail/DropdownActions/index.tsx
+++ b/src/views/TagDetail/DropdownActions/index.tsx
@@ -85,7 +85,7 @@ const BaseDropdownActions = ({
             <Translate
               zh_hant="添加精選"
               zh_hans="添加精选"
-              en="Add Articles into Featured"
+              en="Add Articles into Trending"
             />
           </TextIcon>
         </Menu.Item>