diff --git a/src/components/ArticleCard/Articles.tsx b/src/components/ArticleCard/Articles.tsx
index 2db3070..2250a31 100644
--- a/src/components/ArticleCard/Articles.tsx
+++ b/src/components/ArticleCard/Articles.tsx
@@ -71,66 +71,71 @@ const ArticlesCard: FunctionComponent<IProps> = ({
             justifyContent={"space-between"}
           >
             <Box>
-              <Heading
-                size="lg"
-                lineHeight={"1.6em"}
-                fontSize={"24px"}
-                mb={"10px"}
-                _hover={{
-                  textDecoration: "underline"
-                }}
-              >
-                <Link to={CTA}>
-                  {truncate(title, 80)}
-                </Link>
-              </Heading>
-              <Text
-                fontSize={"14px"}
-                lineHeight={"1.7em"}
-                color={"#0009"}
-                dangerouslySetInnerHTML={stripTags(truncate(description, 200))}
-              />
+              <Box display={"flex"}>
+                <Heading
+                  size="lg"
+                  lineHeight={"1.6em"}
+                  fontSize={"24px"}
+                  mb={"10px"}
+                  _hover={{
+                    textDecoration: "underline"
+                  }}
+                >
+                  <Link to={CTA}>
+                    {truncate(title, 80)}
+                  </Link>
+                </Heading>
 
-              <Flex flex="1" gap={2} my={"12px"} flexDirection={{ base: "column", md: "row" }}>
-                <Box display={"flex"} gap={3} alignItems={"center"}>
-                  {authorUsername && (
-                    <Link to={`/user/${authorUsername}`}>
-                      <Avatar size={"xs"} name={authorFullname} src={authorAvatar} />
+                {isOwner && (
+                <Flex p={"5px"} gap={2}>
+                  <Box>
+                    <Link to={`/articles/edit/${id}`}>
+                      <CiEdit size={"25px"} cursor={"pointer"} />
                     </Link>
-                  )}
+                  </Box>
+
+                  <Box>
+                    <MdDeleteOutline size={"25px"} color="red" cursor={"pointer"} onClick={onDelete} />
+                  </Box>
+                </Flex>
+              )}
+              </Box>
 
-                  {authorUsername && (
-                    <Heading size="xs" fontSize={"13px"}>
+              <Box>
+                <Text
+                  fontSize={"14px"}
+                  lineHeight={"1.7em"}
+                  color={"#0009"}
+                  dangerouslySetInnerHTML={stripTags(truncate(description, 200))}
+                />
+
+                <Flex flex="1" gap={2} my={"12px"} flexDirection={{ base: "column", md: "row" }}>
+                  <Box display={"flex"} gap={3} alignItems={"center"}>
+                    {authorUsername && (
                       <Link to={`/user/${authorUsername}`}>
-                        {authorUsername}
+                        <Avatar size={"xs"} name={authorFullname} src={authorAvatar} />
                       </Link>
-                    </Heading>
-                  )}
-                </Box>
+                    )}
 
-                <Box display={"flex"} gap={3} alignItems={"center"}>
-                  {authorProfileHeadlines && (
-                    <Text fontSize={"12px"} color={"#0009"}>{truncate(authorProfileHeadlines, 60)}</Text>
-                  )}
+                    {authorUsername && (
+                      <Heading size="xs" fontSize={"13px"}>
+                        <Link to={`/user/${authorUsername}`}>
+                          {authorUsername}
+                        </Link>
+                      </Heading>
+                    )}
+                  </Box>
 
-                  <Text fontSize={"12px"} color={"#0009"}>{read_time}</Text>
-                </Box>
-              </Flex>
-            </Box>
+                  <Box display={"flex"} gap={3} alignItems={"center"}>
+                    {authorProfileHeadlines && (
+                      <Text fontSize={"12px"} color={"#0009"}>{truncate(authorProfileHeadlines, 60)}</Text>
+                    )}
 
-            {isOwner && (
-              <Flex p={"5px"} gap={2}>
-                <Box>
-                  <Link to={`/articles/edit/${id}`}>
-                    <CiEdit size={"25px"} cursor={"pointer"} />
-                  </Link>
-                </Box>
-
-                <Box>
-                  <MdDeleteOutline size={"25px"} color="red" cursor={"pointer"} onClick={onDelete} />
-                </Box>
-              </Flex>
-            )}
+                    <Text fontSize={"12px"} color={"#0009"}>{read_time}</Text>
+                  </Box>
+                </Flex>
+              </Box>
+            </Box>
           </Box>
         </Box>
       </CardBody>
diff --git a/src/hooks/article/useCreateArticleDisLike.ts b/src/hooks/article/useCreateArticleDisLike.ts
index 1370dcb..002956c 100644
--- a/src/hooks/article/useCreateArticleDisLike.ts
+++ b/src/hooks/article/useCreateArticleDisLike.ts
@@ -16,6 +16,10 @@ export const useCreateArticleDisLike = () => {
       queryClient.invalidateQueries({
         queryKey: ['article']
       });
+
+      queryClient.invalidateQueries({
+        queryKey: ['public-author-article']
+      });
     },
     onError: (error) => {
       errorNotification(error?.message)
diff --git a/src/hooks/article/useCreateArticleLike.ts b/src/hooks/article/useCreateArticleLike.ts
index 7e1dee1..54797b1 100644
--- a/src/hooks/article/useCreateArticleLike.ts
+++ b/src/hooks/article/useCreateArticleLike.ts
@@ -16,6 +16,10 @@ export const useCreateArticleLike = () => {
       queryClient.invalidateQueries({
         queryKey: ['article']
       });
+
+      queryClient.invalidateQueries({
+        queryKey: ['public-author-article']
+      });
     },
     onError: (error) => {
       errorNotification(error?.message)
diff --git a/src/hooks/thread/useCreateThreadDisLike.ts b/src/hooks/thread/useCreateThreadDisLike.ts
index 2b695ad..b0419d2 100644
--- a/src/hooks/thread/useCreateThreadDisLike.ts
+++ b/src/hooks/thread/useCreateThreadDisLike.ts
@@ -16,6 +16,10 @@ export const useCreateThreadDisLike = () => {
       queryClient.invalidateQueries({
         queryKey: ['thread']
       });
+
+      queryClient.invalidateQueries({
+        queryKey: ['public-author-threads']
+      });
     },
     onError: (error) => {
       errorNotification(error?.message)
diff --git a/src/hooks/thread/useCreateThreadLike.ts b/src/hooks/thread/useCreateThreadLike.ts
index e3b1127..f50b239 100644
--- a/src/hooks/thread/useCreateThreadLike.ts
+++ b/src/hooks/thread/useCreateThreadLike.ts
@@ -16,6 +16,10 @@ export const useCreateThreadLike = () => {
       queryClient.invalidateQueries({
         queryKey: ['thread']
       });
+
+      queryClient.invalidateQueries({
+        queryKey: ['public-author-threads']
+      });
     },
     onError: (error) => {
       errorNotification(error?.message)
diff --git a/src/hooks/thread/useDeleteThread.ts b/src/hooks/thread/useDeleteThread.ts
index a78cc8c..88ecdfb 100644
--- a/src/hooks/thread/useDeleteThread.ts
+++ b/src/hooks/thread/useDeleteThread.ts
@@ -18,6 +18,10 @@ export const useDeleteThread = () => {
       queryClient.invalidateQueries({
         queryKey: ['thread']
       })
+
+      queryClient.invalidateQueries({
+        queryKey: ['public-author-threads']
+      });
     },
     onError: (error) => {
       errorNotification(error?.message)
diff --git a/src/pages/Users/show/about.tsx b/src/pages/Users/show/about.tsx
index d108f4d..0ddb889 100644
--- a/src/pages/Users/show/about.tsx
+++ b/src/pages/Users/show/about.tsx
@@ -22,7 +22,9 @@ const PublicUserAboutDetails: FunctionComponent<PublicUserAboutDetailsProps> = (
       </Text>
 
       <Box mt={"30px"}>
-        <Text fontSize={"14px"}>Connect with <Text as={"span"} fontWeight={"bold"}>{data?.fullname}</Text></Text>
+        {data?.twitter && (
+          <Text fontSize={"14px"}>Connect with <Text as={"span"} fontWeight={"bold"}>{data?.fullname}</Text></Text>
+        )}
 
         <HStack
           spacing={3}
diff --git a/src/pages/Users/show/index.tsx b/src/pages/Users/show/index.tsx
index 48a2d73..829ec1f 100644
--- a/src/pages/Users/show/index.tsx
+++ b/src/pages/Users/show/index.tsx
@@ -27,10 +27,11 @@ const ShowUserPublicPosts: FunctionComponent = () => {
 
   const { data, isLoading } = useGetPublicUser(username!)
 
-  if (!data) return <NotFound />;
-
+  
   if (isLoading) return <Skeleton />
 
+  if (!data) return <NotFound />;
+
   const userData = data?.data;
 
   return (