diff --git a/client/components/Card.jsx b/client/components/Card.jsx
index 4f27551..aec1200 100644
--- a/client/components/Card.jsx
+++ b/client/components/Card.jsx
@@ -1,11 +1,24 @@
-import { Box, Center, useColorModeValue } from "@chakra-ui/react";
+import { Box, Center, Icon, useColorModeValue } from "@chakra-ui/react";
 import Image from "next/image";
 import { useRouter } from "next/router";
 import React from "react";
-import { FaDiscord, FaTree, FaWhatsapp } from "react-icons/fa";
+import {
+  FaDiscord,
+  FaRegSnowflake,
+  FaSun,
+  FaTree,
+  FaWhatsapp,
+} from "react-icons/fa";
+import { GiChestnutLeaf } from "react-icons/gi";
 import Tilt from "react-vanilla-tilt";
 
-const Icon = ({ link, titleColor }) => (
+const termToIcon = {
+  Fall: GiChestnutLeaf,
+  Winter: FaRegSnowflake,
+  Summer: FaSun,
+};
+
+const LinkIcon = ({ link, titleColor }) => (
   <>
     {link.includes("discord") && (
       <FaDiscord color={titleColor} style={{ marginRight: "5px" }} />
@@ -19,7 +32,28 @@ const Icon = ({ link, titleColor }) => (
   </>
 );
 
-export const Card = ({ name, description, image, links, id }) => {
+const CourseInfo = ({ descriptionColor, campus, term, year }) => (
+  <>
+    <Box
+      mt="1"
+      color={descriptionColor}
+      fontWeight="semibold"
+      as="h2"
+      isTruncated
+    >
+      {campus} <Icon as={termToIcon[term]} /> {year}
+    </Box>
+  </>
+);
+
+export const Card = ({
+  name,
+  image,
+  links,
+  id,
+  isCommunity,
+  courseInformation,
+}) => {
   const { locale, defaultLocale, push } = useRouter();
   const backgroundColor = useColorModeValue("#FFFFFF", "#181a1b");
   const descriptionColor = useColorModeValue("gray.600", "gray.400");
@@ -45,6 +79,7 @@ export const Card = ({ name, description, image, links, id }) => {
       <Box
         bg={backgroundColor}
         maxW="sm"
+        minHeight="100%"
         borderWidth="1px"
         borderRadius="lg"
         overflow="hidden"
@@ -68,19 +103,15 @@ export const Card = ({ name, description, image, links, id }) => {
           >
             {name}
           </Box>
-
-          <Box
-            mt="1"
-            color={descriptionColor}
-            fontWeight="semibold"
-            as="h2"
-            isTruncated
-          >
-            {description}
-          </Box>
+          {!isCommunity && (
+            <CourseInfo
+              descriptionColor={descriptionColor}
+              {...courseInformation}
+            />
+          )}
           <Box className="d-flex" mt="2">
             {links.map((link, index) => (
-              <Icon key={index} color={titleColor} link={link} />
+              <LinkIcon key={index} color={titleColor} link={link} />
             ))}
           </Box>
         </Box>
diff --git a/client/gql/GroupChat.js b/client/gql/GroupChat.js
index bd0a00c..b7c3280 100644
--- a/client/gql/GroupChat.js
+++ b/client/gql/GroupChat.js
@@ -89,6 +89,12 @@ export const SEARCH_GROUPCHATS = gql`
         links
         id
         isCommunity
+        courseInformation {
+          term
+          campus
+          code
+          year
+        }
       }
       totalPages
       pageNumber
@@ -110,6 +116,12 @@ export const SEARCH_ALL_GROUPCHATS = gql`
         links
         id
         isCommunity
+        courseInformation {
+          term
+          campus
+          code
+          year
+        }
       }
       totalPages
       pageNumber
diff --git a/server/dist/resolvers/GroupChatResolver.js b/server/dist/resolvers/GroupChatResolver.js
index 560f6bb..72b49d7 100644
--- a/server/dist/resolvers/GroupChatResolver.js
+++ b/server/dist/resolvers/GroupChatResolver.js
@@ -82,10 +82,19 @@ let GroupChatResolver = class GroupChatResolver {
         if (type != undefined) {
             queryObj = { ...queryObj, isCommunity: type };
         }
-        const groupChats = await database_1.GroupChat.find(queryObj)
-            .sort({ views: -1, likes: -1 })
-            .skip(page * pageSize)
-            .limit(pageSize);
+        let groupChats;
+        if (type) {
+            groupChats = await database_1.GroupChat.find(queryObj)
+                .sort({ views: -1, likes: -1 })
+                .skip(page * pageSize)
+                .limit(pageSize);
+        }
+        else {
+            groupChats = await database_1.GroupChat.find(queryObj)
+                .sort({ created: -1, views: -1, likes: -1 })
+                .skip(page * pageSize)
+                .limit(pageSize);
+        }
         const totalCount = await database_1.GroupChat.find(queryObj).countDocuments();
         if (totalCount === 0) {
             return {
diff --git a/server/dist/resolvers/GroupChatResolver.js.map b/server/dist/resolvers/GroupChatResolver.js.map
index dc96b5f..72feab5 100644
--- a/server/dist/resolvers/GroupChatResolver.js.map
+++ b/server/dist/resolvers/GroupChatResolver.js.map
@@ -1 +1 @@
-{"version":3,"file":"GroupChatResolver.js","sourceRoot":"","sources":["../../resolvers/GroupChatResolver.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"GroupChatResolver.js","sourceRoot":"","sources":["../../resolvers/GroupChatResolver.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/server/resolvers/GroupChatResolver.ts b/server/resolvers/GroupChatResolver.ts
index 7ffcd3e..8fd5d21 100644
--- a/server/resolvers/GroupChatResolver.ts
+++ b/server/resolvers/GroupChatResolver.ts
@@ -102,10 +102,21 @@ export class GroupChatResolver {
     if (type != undefined) {
       queryObj = { ...queryObj, isCommunity: type };
     }
-    const groupChats = await GroupChatModel.find(queryObj)
-      .sort({ views: -1, likes: -1 })
-      .skip(page * pageSize)
-      .limit(pageSize);
+
+    let groupChats;
+
+    if (type) {
+      groupChats = await GroupChatModel.find(queryObj)
+        .sort({ views: -1, likes: -1 })
+        .skip(page * pageSize)
+        .limit(pageSize);
+    } else {
+      groupChats = await GroupChatModel.find(queryObj)
+        .sort({ created: -1, views: -1, likes: -1 })
+        .skip(page * pageSize)
+        .limit(pageSize);
+    }
+
     const totalCount = await GroupChatModel.find(queryObj).countDocuments();
     if (totalCount === 0) {
       return {