diff --git a/app/calendar/components/EventInfo.tsx b/app/calendar/components/EventInfo.tsx
index b6d2e15e2..626b8820f 100644
--- a/app/calendar/components/EventInfo.tsx
+++ b/app/calendar/components/EventInfo.tsx
@@ -1,4 +1,16 @@
-import { Badge, Box, Button, Flex, Grid, Heading } from "@chakra-ui/react";
+import {
+  Badge,
+  Box,
+  Button,
+  Flex,
+  Grid,
+  Heading,
+  Popover,
+  PopoverArrow,
+  PopoverContent,
+  PopoverHeader,
+  PopoverTrigger,
+} from "@chakra-ui/react";
 import { Trans } from "@lingui/macro";
 import Markdown from "components/common/Markdown";
 import MyLink from "components/common/MyLink";
@@ -41,16 +53,33 @@ const TournamentInfo = ({ event }: EventInfoProps) => {
           <Heading fontFamily="'Rubik', sans-serif" size="lg">
             {event.name}
           </Heading>
-          <Flex flexWrap="wrap" justifyContent="center" mt={3} mb={2}>
-            {event.tags.map((tag) => {
-              const tagInfo = TAGS.find((tagObj) => tagObj.code === tag)!;
-              return (
-                <Badge mx={1} bg={tagInfo.color} color="black" key={tag}>
-                  {tagInfo.name}
-                </Badge>
-              );
-            })}
-          </Flex>
+          {event.tags.length > 0 && (
+            <Flex flexWrap="wrap" justifyContent="center" mt={3} mb={2}>
+              {event.tags.map((tag) => {
+                const tagInfo = TAGS.find((tagObj) => tagObj.code === tag)!;
+                return (
+                  <Popover
+                    key={tag}
+                    trigger="hover"
+                    variant="responsive"
+                    placement="top"
+                  >
+                    <PopoverTrigger>
+                      <Badge mx={1} bg={tagInfo.color} color="black">
+                        {tagInfo.name}
+                      </Badge>
+                    </PopoverTrigger>
+                    <PopoverContent bg={secondaryBgColor}>
+                      <PopoverHeader fontWeight="semibold">
+                        {tagInfo.description}
+                      </PopoverHeader>
+                      <PopoverArrow bg={secondaryBgColor} />
+                    </PopoverContent>
+                  </Popover>
+                );
+              })}
+            </Flex>
+          )}
           <Grid
             templateColumns="2fr 4fr 2fr"
             placeItems="center flex-start"
@@ -106,11 +135,22 @@ const TournamentInfo = ({ event }: EventInfoProps) => {
           gridColumnGap="1rem"
           maxW={canEdit ? "32rem" : "24rem"}
           mx="auto"
+          mt={4}
         >
-          {/* TODO */}
-          <Button leftIcon={<DiscordIcon />} size="sm" variant="outline">
-            Join Discord
-          </Button>
+          {event.discordInviteUrl ? (
+            <MyLink href={event.discordInviteUrl} isExternal>
+              <Button
+                leftIcon={<DiscordIcon />}
+                size="sm"
+                variant="outline"
+                width="100%"
+              >
+                Join Discord
+              </Button>
+            </MyLink>
+          ) : (
+            <div />
+          )}
           <Button
             leftIcon={<FiInfo />}
             size="sm"
diff --git a/app/calendar/utils.ts b/app/calendar/utils.ts
index caab0c222..969a0e849 100644
--- a/app/calendar/utils.ts
+++ b/app/calendar/utils.ts
@@ -40,7 +40,7 @@ export const TAGS = [
   {
     code: "LOW",
     name: t`Skill cap`,
-    description: t`Limited who can play in this tournament based on skill.`,
+    description: t`Who can play in this tournament is limited by skill.`,
     color: "#BBDEFB",
   },
   {
@@ -67,6 +67,12 @@ export const TAGS = [
     description: t`This tournament is played locally.`,
     color: "#263238",
   },
+  {
+    code: "QUALIFIER",
+    name: t`Qualifier`,
+    description: t`This tournament is a qualifier for another event.`,
+    color: "#FFC0CB",
+  },
 ] as const;
 
 export const EVENT_FORMATS = [