diff --git a/web/src/components/TextUI.tsx b/web/src/components/TextUI.tsx
index 91566ac..00b9f61 100644
--- a/web/src/components/TextUI.tsx
+++ b/web/src/components/TextUI.tsx
@@ -59,9 +59,7 @@ const TextUI: React.FC = () => {
           borderRadius="md"
           maxW="xs"
         >
-          <Text>
-            <ReactMarkdown>{data.text}</ReactMarkdown>
-          </Text>
+          <ReactMarkdown>{data.text}</ReactMarkdown>
         </Box>
       </ScaleFade>
     </Flex>
diff --git a/web/src/components/features/menu/Item.tsx b/web/src/components/features/menu/Item.tsx
index a26ca21..10e9369 100644
--- a/web/src/components/features/menu/Item.tsx
+++ b/web/src/components/features/menu/Item.tsx
@@ -16,84 +16,92 @@ const Item: React.FC<{
   option: [string, Option];
 }> = ({ option }) => {
   return (
-    <Popover
-      placement="right-start"
-      trigger="hover"
-      eventListeners={{ scroll: true }}
-      isLazy
-    >
-      <PopoverTrigger>
-        <Box
-          bg="gray.800"
-          borderRadius="md"
-          h="fit-content"
-          w="100%"
-          p={2}
-          mb={1}
-          fontFamily="Poppins"
-          fontSize="md"
-          transition="300ms"
-          _hover={{ bg: "gray.700" }}
-        >
-          <Flex w="100%">
-            <Box>
-              <Box paddingBottom={1}>
-                <Text w="100%" fontWeight="medium">
-                  {option[0]}
-                </Text>
-              </Box>
-              {option[1].description && (
+    <>
+      <Popover
+        placement="right-start"
+        trigger="hover"
+        eventListeners={{ scroll: true }}
+        isLazy
+      >
+        <PopoverTrigger>
+          <Box
+            bg="gray.800"
+            borderRadius="md"
+            h="fit-content"
+            w="100%"
+            p={2}
+            mb={1}
+            fontFamily="Poppins"
+            fontSize="md"
+            transition="300ms"
+            _hover={{ bg: "gray.700" }}
+          >
+            <Flex w="100%">
+              <Box>
                 <Box paddingBottom={1}>
-                  <Text>{option[1].description}</Text>
+                  <Text w="100%" fontWeight="medium">
+                    {option[0]}
+                  </Text>
                 </Box>
+                {option[1].description && (
+                  <Box paddingBottom={1}>
+                    <Text>{option[1].description}</Text>
+                  </Box>
+                )}
+              </Box>
+              {option[1].subMenu && (
+                <>
+                  <Spacer />
+                  <Box
+                    alignSelf="center"
+                    justifySelf="center"
+                    mr={4}
+                    fontSize="xl"
+                  >
+                    <FontAwesomeIcon icon="chevron-right" />
+                  </Box>
+                </>
               )}
-            </Box>
-            {option[1].subMenu && (
-              <>
-                <Spacer />
-                <Box
-                  alignSelf="center"
-                  justifySelf="center"
-                  mr={4}
-                  fontSize="xl"
+            </Flex>
+            <Portal>
+              {option[1].metadata && (
+                <PopoverContent
+                  fontFamily="Poppins"
+                  bg="gray.800"
+                  outline="none"
+                  border="none"
+                  w="fit-content"
+                  maxW="2xs"
                 >
-                  <FontAwesomeIcon icon="chevron-right" />
-                </Box>
-              </>
-            )}
-          </Flex>
-          <Portal>
-            <PopoverContent
-              fontFamily="Poppins"
-              bg="gray.800"
-              outline="none"
-              border="none"
-              w="fit-content"
-              maxW="2xs"
-            >
-              <PopoverBody>
-                {option[1]?.metadata && Array.isArray(option[1].metadata) ? (
-                  option[1].metadata.map((metadata: string, index: number) => (
-                    <Text key={`context-metadata-${index}`}>{metadata}</Text>
-                  ))
-                ) : (
-                  <>
-                    {typeof option[1].metadata === "object" &&
-                      Object.entries(option[1].metadata).map(
-                        (metadata: { [key: string]: any }, index) => (
+                  <PopoverBody>
+                    {Array.isArray(option[1].metadata) ? (
+                      option[1].metadata.map(
+                        (metadata: string, index: number) => (
                           <Text key={`context-metadata-${index}`}>
-                            {metadata[0]}: {metadata[1]}
+                            {metadata}
                           </Text>
                         )
-                      )}
-                  </>
-                )}
-              </PopoverBody>
-            </PopoverContent>
-          </Portal>
-        </Box>
-      </PopoverTrigger>
-    </Popover>
+                      )
+                    ) : (
+                      <>
+                        {typeof option[1].metadata === "object" &&
+                          Object.entries(option[1].metadata).map(
+                            (metadata: { [key: string]: any }, index) => (
+                              <Text key={`context-metadata-${index}`}>
+                                {metadata[0]}: {metadata[1]}
+                              </Text>
+                            )
+                          )}
+                      </>
+                    )}
+                  </PopoverBody>
+                </PopoverContent>
+              )}
+            </Portal>
+          </Box>
+        </PopoverTrigger>
+      </Popover>
+    </>
   );
 };