diff --git a/apps/portal/src/components/resumes/badges/ResumeUserBadges.tsx b/apps/portal/src/components/resumes/badges/ResumeUserBadges.tsx
index 3e6325c7..1622dd9e 100644
--- a/apps/portal/src/components/resumes/badges/ResumeUserBadges.tsx
+++ b/apps/portal/src/components/resumes/badges/ResumeUserBadges.tsx
@@ -17,12 +17,15 @@ export default function ResumeUserBadges({ userId }: Props) {
     'resumes.resume.findUserMaxResumeUpvoteCount',
     { userId },
   ]);
+  const userTopUpvotedCommentCountQuery = trpc.useQuery([
+    'resumes.resume.findUserTopUpvotedCommentCount',
+    { userId },
+  ]);
 
-  // TODO: Add other badges in
   const payload: BadgePayload = {
     maxResumeUpvoteCount: userMaxResumeUpvoteCountQuery.data ?? 0,
     reviewedResumesCount: userReviewedResumeCountQuery.data ?? 0,
-    topUpvotedCommentCount: 20,
+    topUpvotedCommentCount: userTopUpvotedCommentCountQuery.data ?? 0,
   };
 
   return (
diff --git a/apps/portal/src/components/resumes/comments/ResumeCommentsList.tsx b/apps/portal/src/components/resumes/comments/ResumeCommentsList.tsx
index 2fe23335..bb13da81 100644
--- a/apps/portal/src/components/resumes/comments/ResumeCommentsList.tsx
+++ b/apps/portal/src/components/resumes/comments/ResumeCommentsList.tsx
@@ -56,6 +56,7 @@ export default function ResumeCommentsList({
     }
     return (
       <Button
+        className="-mb-2"
         display="block"
         label="Add your review"
         variant="tertiary"
@@ -73,7 +74,7 @@ export default function ResumeCommentsList({
           <Spinner display="block" size="lg" />
         </div>
       ) : (
-        <div className="m-2 flow-root h-[calc(100vh-20rem)] w-full flex-col space-y-4 overflow-y-auto overflow-x-hidden">
+        <div className="scrollbar-hide m-2 flow-root h-[calc(100vh-20rem)] w-full flex-col space-y-4 overflow-y-auto overflow-x-hidden pt-14 pb-6">
           {RESUME_COMMENTS_SECTIONS.map(({ label, value }) => {
             const comments = commentsQuery.data
               ? commentsQuery.data.filter((comment: ResumeComment) => {
diff --git a/apps/portal/src/server/router/resumes/resumes-resume-router.ts b/apps/portal/src/server/router/resumes/resumes-resume-router.ts
index 9e46e0e6..bda6464f 100644
--- a/apps/portal/src/server/router/resumes/resumes-resume-router.ts
+++ b/apps/portal/src/server/router/resumes/resumes-resume-router.ts
@@ -1,4 +1,5 @@
 import { z } from 'zod';
+import { Vote } from '@prisma/client';
 
 import { createRouter } from '../context';
 
@@ -149,11 +150,16 @@ export const resumesRouter = createRouter()
     async resolve({ ctx, input }) {
       return await ctx.prisma.resumesResume.count({
         where: {
+          // User has commented on this resume
           comments: {
             some: {
               userId: input.userId,
             },
           },
+          // Not user's own resume
+          userId: {
+            not: input.userId,
+          },
         },
       });
     },
@@ -164,18 +170,18 @@ export const resumesRouter = createRouter()
     }),
     async resolve({ ctx, input }) {
       const highestUpvotedResume = await ctx.prisma.resumesResume.findFirst({
-        include: {
+        orderBy: {
+          stars: {
+            _count: 'desc',
+          },
+        },
+        select: {
           _count: {
             select: {
               stars: true,
             },
           },
         },
-        orderBy: {
-          stars: {
-            _count: 'desc',
-          },
-        },
         where: {
           userId: input.userId,
         },
@@ -183,14 +189,61 @@ export const resumesRouter = createRouter()
 
       return highestUpvotedResume?._count?.stars ?? 0;
     },
+  })
+  .query('findUserTopUpvotedCommentCount', {
+    input: z.object({
+      userId: z.string(),
+    }),
+    async resolve({ ctx, input }) {
+      const resumes = await ctx.prisma.resumesResume.findMany({
+        select: {
+          comments: {
+            select: {
+              userId: true,
+              votes: {
+                select: {
+                  value: true,
+                },
+              },
+            },
+          },
+        },
+      });
+
+      let topUpvotedCommentCount = 0;
+
+      for (const resume of resumes) {
+        let highestVoteCount = 1;
+
+        // Get Map of {userId, voteCount} for each comment
+        const commentUpvotePairs = [];
+        for (const comment of resume.comments) {
+          const { userId, votes } = comment;
+          let voteCount = 0;
+          for (const vote of votes) {
+            if (vote.value === Vote.UPVOTE) {
+              voteCount++;
+            } else {
+              voteCount--;
+            }
+          }
+          if (voteCount >= highestVoteCount) {
+            highestVoteCount = voteCount;
+            commentUpvotePairs.push({ userId, voteCount });
+          }
+        }
+
+        // Filter to get the userIds with the highest vote counts
+        const userIds = commentUpvotePairs
+          .filter((pair) => pair.voteCount === highestVoteCount)
+          .map((pair) => pair.userId);
+
+        // Increment if input userId is the highest voted comment
+        if (userIds.includes(input.userId)) {
+          topUpvotedCommentCount++;
+        }
+      }
+
+      return topUpvotedCommentCount;
+    },
   });
-// .query('findUserTopUpvotedCommentCount', {
-//   input: z.object({
-//     userId: z.string(),
-//   }),
-//   async resolve({ ctx, input }) {
-//     const highestUpvotedResume = await ctx.prisma.resumesComment.groupBy({
-//       by: ['resumeId'],
-//     })
-//   },
-// });
diff --git a/packages/tailwind-config/package.json b/packages/tailwind-config/package.json
index 71087c12..616cdfe1 100644
--- a/packages/tailwind-config/package.json
+++ b/packages/tailwind-config/package.json
@@ -8,6 +8,7 @@
     "@tailwindcss/forms": "^0.5.3",
     "@tailwindcss/line-clamp": "^0.4.2",
     "@tailwindcss/typography": "^0.5.7",
+    "tailwind-scrollbar-hide": "^1.1.7",
     "tailwindcss": "^3.1.8"
   }
 }
diff --git a/packages/tailwind-config/tailwind.config.js b/packages/tailwind-config/tailwind.config.js
index 8fa4940f..38f84e49 100644
--- a/packages/tailwind-config/tailwind.config.js
+++ b/packages/tailwind-config/tailwind.config.js
@@ -23,5 +23,6 @@ module.exports = {
     require('@tailwindcss/forms'),
     require('@tailwindcss/line-clamp'),
     require('@tailwindcss/typography'),
+    require('tailwind-scrollbar-hide'),
   ],
 };
diff --git a/yarn.lock b/yarn.lock
index bfce8e7c..04c23ef7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13791,6 +13791,11 @@ synchronous-promise@^2.0.15:
   resolved "https://registry.npmjs.org/synchronous-promise/-/synchronous-promise-2.0.16.tgz"
   integrity sha512-qImOD23aDfnIDNqlG1NOehdB9IYsn1V9oByPjKY1nakv2MQYCEMyX033/q+aEtYCpmYK1cv2+NTmlH+ra6GA5A==
 
+tailwind-scrollbar-hide@^1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/tailwind-scrollbar-hide/-/tailwind-scrollbar-hide-1.1.7.tgz#90b481fb2e204030e3919427416650c54f56f847"
+  integrity sha512-X324n9OtpTmOMqEgDUEA/RgLrNfBF/jwJdctaPZDzB3mppxJk7TLIDmOreEDm1Bq4R9LSPu4Epf8VSdovNU+iA==
+
 tailwindcss@^3.1.8:
   version "3.1.8"
   resolved "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.1.8.tgz"