diff --git a/apps/portal/src/components/questions/CommentListItem.tsx b/apps/portal/src/components/questions/AnswerCommentListItem.tsx
similarity index 58%
rename from apps/portal/src/components/questions/CommentListItem.tsx
rename to apps/portal/src/components/questions/AnswerCommentListItem.tsx
index 1cf87d50..c65a379f 100644
--- a/apps/portal/src/components/questions/CommentListItem.tsx
+++ b/apps/portal/src/components/questions/AnswerCommentListItem.tsx
@@ -1,8 +1,11 @@
 import { format } from 'date-fns';
 
+import { useAnswerCommentVote } from '~/utils/questions/useVote';
+
 import VotingButtons from './VotingButtons';
 
-export type CommentListItemProps = {
+export type AnswerCommentListItemProps = {
+  answerCommentId: string;
   authorImageUrl: string;
   authorName: string;
   content: string;
@@ -10,16 +13,26 @@ export type CommentListItemProps = {
   upvoteCount: number;
 };
 
-export default function CommentListItem({
+export default function AnswerCommentListItem({
   authorImageUrl,
   authorName,
   content,
   createdAt,
   upvoteCount,
-}: CommentListItemProps) {
+  answerCommentId,
+}: AnswerCommentListItemProps) {
+  const { handleDownvote, handleUpvote, vote } =
+    useAnswerCommentVote(answerCommentId);
+
   return (
     <div className="flex gap-4 border bg-white p-2 ">
-      <VotingButtons size="sm" upvoteCount={upvoteCount} />
+      <VotingButtons
+        size="sm"
+        upvoteCount={upvoteCount}
+        vote={vote}
+        onDownvote={handleDownvote}
+        onUpvote={handleUpvote}
+      />
       <div className="mt-1 flex flex-col gap-1">
         <div className="flex items-center gap-2">
           <img
@@ -28,7 +41,7 @@ export default function CommentListItem({
             src={authorImageUrl}></img>
           <h1 className="font-bold">{authorName}</h1>
           <p className="pt-1 text-xs font-extralight">
-            Posted on: {format(createdAt, 'Pp')}
+            Posted on: {format(createdAt, 'h:mm a, MMMM dd, yyyy')}
           </p>
         </div>
         <p className="pl-1 pt-1">{content}</p>
diff --git a/apps/portal/src/components/questions/ContributeQuestionCard.tsx b/apps/portal/src/components/questions/ContributeQuestionCard.tsx
index fa11f098..73faba27 100644
--- a/apps/portal/src/components/questions/ContributeQuestionCard.tsx
+++ b/apps/portal/src/components/questions/ContributeQuestionCard.tsx
@@ -40,7 +40,7 @@ export default function ContributeQuestionCard({
           placeholder="Contribute a question"
           onChange={handleOpenContribute}
         />
-        <div className="flex items-end justify-center gap-x-2">
+        <div className="flex flex-wrap items-end justify-center gap-x-2">
           <div className="min-w-[150px] flex-1">
             <TextInput
               disabled={true}
diff --git a/apps/portal/src/components/questions/ContributeQuestionDialog.tsx b/apps/portal/src/components/questions/ContributeQuestionDialog.tsx
index e2ae8c8c..65cb1058 100644
--- a/apps/portal/src/components/questions/ContributeQuestionDialog.tsx
+++ b/apps/portal/src/components/questions/ContributeQuestionDialog.tsx
@@ -62,9 +62,9 @@ export default function ContributeQuestionDialog({
                 leaveFrom="opacity-100 translate-y-0 sm:scale-100"
                 leaveTo="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95">
                 <Dialog.Panel className="relative max-w-5xl transform overflow-hidden rounded-lg bg-white text-left shadow-xl transition-all sm:my-8 sm:w-full">
-                  <div className="bg-white  p-6 pt-5 sm:pb-4">
+                  <div className="bg-white p-6 pt-5 sm:pb-4">
                     <div className="flex flex-1 items-stretch">
-                      <div className="mt-3 w-full sm:mt-0 sm:ml-4 sm:text-left">
+                      <div className="mt-3 w-full sm:mt-0 sm:text-left">
                         <Dialog.Title
                           as="h3"
                           className="text-lg font-medium leading-6 text-gray-900">
diff --git a/apps/portal/src/components/questions/ContributeQuestionForm.tsx b/apps/portal/src/components/questions/ContributeQuestionForm.tsx
index 367f0d88..5e230d73 100644
--- a/apps/portal/src/components/questions/ContributeQuestionForm.tsx
+++ b/apps/portal/src/components/questions/ContributeQuestionForm.tsx
@@ -1,12 +1,16 @@
+import { startOfMonth } from 'date-fns';
 import { useState } from 'react';
-import { useForm } from 'react-hook-form';
-import {
-  BuildingOffice2Icon,
-  CalendarDaysIcon,
-  UserIcon,
-} from '@heroicons/react/24/outline';
+import { Controller, useForm } from 'react-hook-form';
+import { CalendarDaysIcon, UserIcon } from '@heroicons/react/24/outline';
 import type { QuestionsQuestionType } from '@prisma/client';
-import { Button, Collapsible, Select, TextArea, TextInput } from '@tih/ui';
+import {
+  Button,
+  CheckboxInput,
+  Collapsible,
+  Select,
+  TextArea,
+  TextInput,
+} from '@tih/ui';
 
 import { QUESTION_TYPES } from '~/utils/questions/constants';
 import {
@@ -14,7 +18,9 @@ import {
   useSelectRegister,
 } from '~/utils/questions/useFormRegister';
 
-import Checkbox from './ui-patch/Checkbox';
+import CompaniesTypeahead from '../shared/CompaniesTypeahead';
+import type { Month } from '../shared/MonthYearPicker';
+import MonthYearPicker from '../shared/MonthYearPicker';
 
 export type ContributeQuestionData = {
   company: string;
@@ -35,8 +41,15 @@ export default function ContributeQuestionForm({
   onSubmit,
   onDiscard,
 }: ContributeQuestionFormProps) {
-  const { register: formRegister, handleSubmit } =
-    useForm<ContributeQuestionData>();
+  const {
+    control,
+    register: formRegister,
+    handleSubmit,
+  } = useForm<ContributeQuestionData>({
+    defaultValues: {
+      date: startOfMonth(new Date()),
+    },
+  });
   const register = useFormRegister(formRegister);
   const selectRegister = useSelectRegister(formRegister);
 
@@ -66,24 +79,35 @@ export default function ContributeQuestionForm({
           />
         </div>
         <div className="min-w-[150px] max-w-[300px] flex-1">
-          <TextInput
-            label="Company"
-            required={true}
-            startAddOn={BuildingOffice2Icon}
-            startAddOnType="icon"
-            {...register('company')}
+          <Controller
+            control={control}
+            name="company"
+            render={({ field }) => (
+              <CompaniesTypeahead
+                onSelect={({ label }) => {
+                  // TODO: To change from using company name to company id (i.e., value)
+                  field.onChange(label);
+                }}
+              />
+            )}
           />
         </div>
 
         <div className="min-w-[150px] max-w-[300px] flex-1">
-          <TextInput
-            label="Date"
-            required={true}
-            startAddOn={CalendarDaysIcon}
-            startAddOnType="icon"
-            {...register('date', {
-              valueAsDate: true,
-            })}
+          <Controller
+            control={control}
+            name="date"
+            render={({ field }) => (
+              <MonthYearPicker
+                value={{
+                  month: (field.value.getMonth() + 1) as Month,
+                  year: field.value.getFullYear(),
+                }}
+                onChange={({ month, year }) =>
+                  field.onChange(startOfMonth(new Date(year, month - 1)))
+                }
+              />
+            )}
           />
         </div>
       </div>
@@ -130,10 +154,11 @@ export default function ContributeQuestionForm({
       </div> */}
       <div className="bg-primary-50 fixed bottom-0 left-0 w-full px-4 py-3 sm:flex sm:flex-row sm:justify-between sm:px-6">
         <div className="mb-1 flex">
-          <Checkbox
-            checked={canSubmit}
+          <CheckboxInput
             label="I have checked that my question is new"
-            onChange={handleCheckSimilarQuestions}></Checkbox>
+            value={canSubmit}
+            onChange={handleCheckSimilarQuestions}
+          />
         </div>
         <div className=" flex gap-x-2">
           <button
diff --git a/apps/portal/src/components/questions/QuestionSearchBar.tsx b/apps/portal/src/components/questions/QuestionSearchBar.tsx
index d72ee69f..c5f401ea 100644
--- a/apps/portal/src/components/questions/QuestionSearchBar.tsx
+++ b/apps/portal/src/components/questions/QuestionSearchBar.tsx
@@ -1,5 +1,8 @@
-import { MagnifyingGlassIcon } from '@heroicons/react/24/outline';
-import { Select, TextInput } from '@tih/ui';
+import {
+  AdjustmentsHorizontalIcon,
+  MagnifyingGlassIcon,
+} from '@heroicons/react/24/outline';
+import { Button, Select, TextInput } from '@tih/ui';
 
 export type SortOption = {
   label: string;
@@ -7,6 +10,7 @@ export type SortOption = {
 };
 
 export type QuestionSearchBarProps<SortOptions extends Array<SortOption>> = {
+  onFilterOptionsToggle: () => void;
   onSortChange?: (sortValue: SortOptions[number]['value']) => void;
   sortOptions: SortOptions;
   sortValue: SortOptions[number]['value'];
@@ -18,10 +22,11 @@ export default function QuestionSearchBar<
   onSortChange,
   sortOptions,
   sortValue,
+  onFilterOptionsToggle,
 }: QuestionSearchBarProps<SortOptions>) {
   return (
-    <div className="flex items-center gap-2">
-      <div className="flex-1 pt-1">
+    <div className="flex items-center gap-4">
+      <div className="flex-1">
         <TextInput
           isLabelHidden={true}
           label="Search by content"
@@ -30,16 +35,28 @@ export default function QuestionSearchBar<
           startAddOnType="icon"
         />
       </div>
-      <span aria-hidden={true} className="pl-3 pr-1 pt-1 text-sm">
-        Sort by:
-      </span>
-      <Select
-        display="inline"
-        isLabelHidden={true}
-        label="Sort by"
-        options={sortOptions}
-        value={sortValue}
-        onChange={onSortChange}></Select>
+      <div className="flex items-center gap-2">
+        <span aria-hidden={true} className="align-middle text-sm font-medium">
+          Sort by:
+        </span>
+        <Select
+          display="inline"
+          isLabelHidden={true}
+          label="Sort by"
+          options={sortOptions}
+          value={sortValue}
+          onChange={onSortChange}
+        />
+      </div>
+      <div className="lg:hidden">
+        <Button
+          addonPosition="start"
+          icon={AdjustmentsHorizontalIcon}
+          label="Filter options"
+          variant="tertiary"
+          onClick={onFilterOptionsToggle}
+        />
+      </div>
     </div>
   );
 }
diff --git a/apps/portal/src/components/questions/QuestionTypeBadge.tsx b/apps/portal/src/components/questions/QuestionTypeBadge.tsx
new file mode 100644
index 00000000..fe62351e
--- /dev/null
+++ b/apps/portal/src/components/questions/QuestionTypeBadge.tsx
@@ -0,0 +1,17 @@
+import type { QuestionsQuestionType } from '@prisma/client';
+import { Badge } from '@tih/ui';
+
+import { QUESTION_TYPES } from '~/utils/questions/constants';
+
+export type QuestionTypeBadgeProps = {
+  type: QuestionsQuestionType;
+};
+
+export default function QuestionTypeBadge({ type }: QuestionTypeBadgeProps) {
+  return (
+    <Badge
+      label={QUESTION_TYPES.find(({ value }) => value === type)!.label}
+      variant="info"
+    />
+  );
+}
diff --git a/apps/portal/src/components/questions/VotingButtons.tsx b/apps/portal/src/components/questions/VotingButtons.tsx
index 74b9193e..cd404dca 100644
--- a/apps/portal/src/components/questions/VotingButtons.tsx
+++ b/apps/portal/src/components/questions/VotingButtons.tsx
@@ -1,16 +1,36 @@
+import React from 'react';
 import { ChevronDownIcon, ChevronUpIcon } from '@heroicons/react/24/outline';
+import type { Vote } from '@prisma/client';
 import type { ButtonSize } from '@tih/ui';
 import { Button } from '@tih/ui';
 
-export type VotingButtonsProps = {
+export type BackendVote = {
+  id: string;
+  vote: Vote;
+};
+
+export type VotingButtonsCallbackProps = {
+  onDownvote: () => void;
+  onUpvote: () => void;
+  vote: BackendVote | null;
+};
+
+export type VotingButtonsProps = VotingButtonsCallbackProps & {
   size?: ButtonSize;
   upvoteCount: number;
 };
 
 export default function VotingButtons({
+  vote,
+  onDownvote,
+  onUpvote,
   upvoteCount,
   size = 'md',
 }: VotingButtonsProps) {
+  const upvoteButtonVariant =
+    vote?.vote === 'UPVOTE' ? 'secondary' : 'tertiary';
+  const downvoteButtonVariant =
+    vote?.vote === 'DOWNVOTE' ? 'secondary' : 'tertiary';
   return (
     <div className="flex flex-col items-center">
       <Button
@@ -18,7 +38,12 @@ export default function VotingButtons({
         isLabelHidden={true}
         label="Upvote"
         size={size}
-        variant="tertiary"
+        variant={upvoteButtonVariant}
+        onClick={(event) => {
+          event.preventDefault();
+          event.stopPropagation();
+          onUpvote();
+        }}
       />
       <p>{upvoteCount}</p>
       <Button
@@ -26,7 +51,12 @@ export default function VotingButtons({
         isLabelHidden={true}
         label="Downvote"
         size={size}
-        variant="tertiary"
+        variant={downvoteButtonVariant}
+        onClick={(event) => {
+          event.preventDefault();
+          event.stopPropagation();
+          onDownvote();
+        }}
       />
     </div>
   );
diff --git a/apps/portal/src/components/questions/card/AnswerCard.tsx b/apps/portal/src/components/questions/card/AnswerCard.tsx
index 16088f3c..20818ee7 100644
--- a/apps/portal/src/components/questions/card/AnswerCard.tsx
+++ b/apps/portal/src/components/questions/card/AnswerCard.tsx
@@ -1,48 +1,63 @@
 import { format } from 'date-fns';
+import { ChatBubbleLeftRightIcon } from '@heroicons/react/24/outline';
 
-import withHref from '~/utils/questions/withHref';
+import { useAnswerVote } from '~/utils/questions/useVote';
 
+import type { VotingButtonsProps } from '../VotingButtons';
 import VotingButtons from '../VotingButtons';
 
 export type AnswerCardProps = {
+  answerId: string;
   authorImageUrl: string;
   authorName: string;
-  commentCount: number;
+  commentCount?: number;
   content: string;
   createdAt: Date;
   upvoteCount: number;
+  votingButtonsSize: VotingButtonsProps['size'];
 };
 
-function AnswerCardWithoutHref({
+export default function AnswerCard({
+  answerId,
   authorName,
   authorImageUrl,
-  upvoteCount,
   content,
   createdAt,
   commentCount,
+  votingButtonsSize,
+  upvoteCount,
 }: AnswerCardProps) {
+  const { handleUpvote, handleDownvote, vote } = useAnswerVote(answerId);
   return (
-    <div className="flex gap-4 rounded-md border bg-white p-2 hover:bg-slate-50">
-      <VotingButtons size="sm" upvoteCount={upvoteCount} />
-      <div className="mt-1 flex flex-col gap-1">
+    <article className="flex gap-4 rounded-md border bg-white p-2">
+      <VotingButtons
+        size={votingButtonsSize}
+        upvoteCount={upvoteCount}
+        vote={vote}
+        onDownvote={handleDownvote}
+        onUpvote={handleUpvote}
+      />
+      <div className="flex flex-col gap-2">
         <div className="flex items-center gap-2">
           <img
             alt={`${authorName} profile picture`}
             className="h-8 w-8 rounded-full"
             src={authorImageUrl}></img>
           <h1 className="font-bold">{authorName}</h1>
-          <p className="pt-1 text-xs font-extralight">
-            Posted on: {format(createdAt, 'Pp')}
+          <p className="text-xs font-extralight">
+            Posted on: {format(createdAt, 'h:mm a, MMMM dd, yyyy')}
           </p>
         </div>
-        <p className="pl-1 pt-1">{content}</p>
-        <p className="py-1 pl-3 text-sm font-light underline	underline-offset-4">
-          {commentCount} comment(s)
-        </p>
+        <p>{content}</p>
+        {commentCount !== undefined && (
+          <div className="flex items-center gap-2 text-slate-500">
+            <ChatBubbleLeftRightIcon className="h-6 w-6" />
+            <p className="text-sm font-medium">
+              {commentCount} {commentCount === 1 ? 'comment' : 'comments'}
+            </p>
+          </div>
+        )}
       </div>
-    </div>
+    </article>
   );
 }
-
-const AnswerCard = withHref(AnswerCardWithoutHref);
-export default AnswerCard;
diff --git a/apps/portal/src/components/questions/card/FullAnswerCard.tsx b/apps/portal/src/components/questions/card/FullAnswerCard.tsx
index 74282c77..7642683a 100644
--- a/apps/portal/src/components/questions/card/FullAnswerCard.tsx
+++ b/apps/portal/src/components/questions/card/FullAnswerCard.tsx
@@ -1,38 +1,11 @@
-import { format } from 'date-fns';
+import type { AnswerCardProps } from './AnswerCard';
+import AnswerCard from './AnswerCard';
 
-import VotingButtons from '../VotingButtons';
+export type FullAnswerCardProps = Omit<
+  AnswerCardProps,
+  'commentCount' | 'votingButtonsSize'
+>;
 
-export type FullAnswerCardProps = {
-  authorImageUrl: string;
-  authorName: string;
-  content: string;
-  createdAt: Date;
-  upvoteCount: number;
-};
-
-export default function FullAnswerCard({
-  authorImageUrl,
-  authorName,
-  content,
-  createdAt,
-  upvoteCount,
-}: FullAnswerCardProps) {
-  return (
-    <article className="flex gap-4 rounded-md border border-slate-300 bg-white p-4">
-      <VotingButtons upvoteCount={upvoteCount}></VotingButtons>
-      <div className="mt-1 flex flex-col gap-1">
-        <div className="flex items-center gap-2">
-          <img
-            alt={`${authorName} profile picture`}
-            className="h-8 w-8 rounded-full"
-            src={authorImageUrl}></img>
-          <h1 className="font-bold">{authorName}</h1>
-          <p className="pt-1 text-xs font-extralight">
-            Posted on: {format(createdAt, 'Pp')}
-          </p>
-        </div>
-        <p className="pl-1 pt-1">{content}</p>
-      </div>
-    </article>
-  );
+export default function FullAnswerCard(props: FullAnswerCardProps) {
+  return <AnswerCard {...props} votingButtonsSize="md" />;
 }
diff --git a/apps/portal/src/components/questions/card/FullQuestionCard.tsx b/apps/portal/src/components/questions/card/FullQuestionCard.tsx
index bc6f5f30..2c3c79ef 100644
--- a/apps/portal/src/components/questions/card/FullQuestionCard.tsx
+++ b/apps/portal/src/components/questions/card/FullQuestionCard.tsx
@@ -1,58 +1,26 @@
-import { Badge } from '@tih/ui';
+import type { QuestionCardProps } from './QuestionCard';
+import QuestionCard from './QuestionCard';
 
-import VotingButtons from '../VotingButtons';
+export type QuestionOverviewCardProps = Omit<
+  QuestionCardProps & {
+    showActionButton: false;
+    showUserStatistics: false;
+    showVoteButtons: true;
+  },
+  | 'actionButtonLabel'
+  | 'onActionButtonClick'
+  | 'showActionButton'
+  | 'showUserStatistics'
+  | 'showVoteButtons'
+>;
 
-type UpvoteProps =
-  | {
-      showVoteButtons: true;
-      upvoteCount: number;
-    }
-  | {
-      showVoteButtons?: false;
-      upvoteCount?: never;
-    };
-
-export type FullQuestionCardProps = UpvoteProps & {
-  company: string;
-  content: string;
-  location: string;
-  receivedCount: number;
-  role: string;
-  timestamp: string;
-  type: string;
-};
-
-export default function FullQuestionCard({
-  company,
-  content,
-  showVoteButtons,
-  upvoteCount,
-  timestamp,
-  role,
-  location,
-  type,
-}: FullQuestionCardProps) {
-  const altText = company + ' logo';
+export default function FullQuestionCard(props: QuestionOverviewCardProps) {
   return (
-    <article className="flex gap-4 rounded-md border border-slate-300 bg-white p-4">
-      {showVoteButtons && <VotingButtons upvoteCount={upvoteCount} />}
-      <div className="flex flex-col gap-2">
-        <div className="flex items-center gap-2">
-          <img alt={altText} src="https://logo.clearbit.com/google.com"></img>
-          <h2 className="ml-2 text-xl">{company}</h2>
-        </div>
-        <div className="flex items-baseline justify-between">
-          <div className="flex items-center gap-2 text-slate-500">
-            <Badge label={type} variant="primary" />
-            <p className="text-xs">
-              {timestamp} · {location} · {role}
-            </p>
-          </div>
-        </div>
-        <div className="mx-2 mb-2">
-          <p>{content}</p>
-        </div>
-      </div>
-    </article>
+    <QuestionCard
+      {...props}
+      showActionButton={false}
+      showUserStatistics={false}
+      showVoteButtons={true}
+    />
   );
 }
diff --git a/apps/portal/src/components/questions/card/QuestionAnswerCard.tsx b/apps/portal/src/components/questions/card/QuestionAnswerCard.tsx
new file mode 100644
index 00000000..b508e5b4
--- /dev/null
+++ b/apps/portal/src/components/questions/card/QuestionAnswerCard.tsx
@@ -0,0 +1,15 @@
+import withHref from '~/utils/questions/withHref';
+
+import type { AnswerCardProps } from './AnswerCard';
+import AnswerCard from './AnswerCard';
+
+export type QuestionAnswerCardProps = Required<
+  Omit<AnswerCardProps, 'votingButtonsSize'>
+>;
+
+function QuestionAnswerCardWithoutHref(props: QuestionAnswerCardProps) {
+  return <AnswerCard {...props} votingButtonsSize="sm" />;
+}
+
+const QuestionAnswerCard = withHref(QuestionAnswerCardWithoutHref);
+export default QuestionAnswerCard;
diff --git a/apps/portal/src/components/questions/card/QuestionCard.tsx b/apps/portal/src/components/questions/card/QuestionCard.tsx
index 75e95dd2..ba530f75 100644
--- a/apps/portal/src/components/questions/card/QuestionCard.tsx
+++ b/apps/portal/src/components/questions/card/QuestionCard.tsx
@@ -1,9 +1,10 @@
-import {
-  ChatBubbleBottomCenterTextIcon,
-  // EyeIcon,
-} from '@heroicons/react/24/outline';
+import { ChatBubbleBottomCenterTextIcon } from '@heroicons/react/24/outline';
+import type { QuestionsQuestionType } from '@prisma/client';
 import { Badge, Button } from '@tih/ui';
 
+import { useQuestionVote } from '~/utils/questions/useVote';
+
+import QuestionTypeBadge from '../QuestionTypeBadge';
 import VotingButtons from '../VotingButtons';
 
 type UpvoteProps =
@@ -41,16 +42,19 @@ type ActionButtonProps =
 export type QuestionCardProps = ActionButtonProps &
   StatisticsProps &
   UpvoteProps & {
+    company: string;
     content: string;
-    href?: string;
     location: string;
+    questionId: string;
     receivedCount: number;
     role: string;
     timestamp: string;
-    type: string;
+    type: QuestionsQuestionType;
   };
 
 export default function QuestionCard({
+  questionId,
+  company,
   answerCount,
   content,
   // ReceivedCount,
@@ -65,13 +69,23 @@ export default function QuestionCard({
   role,
   location,
 }: QuestionCardProps) {
+  const { handleDownvote, handleUpvote, vote } = useQuestionVote(questionId);
+
   return (
-    <article className="flex gap-4 rounded-md border border-slate-300 bg-white p-4 hover:bg-slate-50">
-      {showVoteButtons && <VotingButtons upvoteCount={upvoteCount} />}
+    <article className="flex gap-4 rounded-md border border-slate-300 bg-white p-4">
+      {showVoteButtons && (
+        <VotingButtons
+          upvoteCount={upvoteCount}
+          vote={vote}
+          onDownvote={handleDownvote}
+          onUpvote={handleUpvote}
+        />
+      )}
       <div className="flex flex-col gap-2">
         <div className="flex items-baseline justify-between">
-          <div className="flex items-center gap-2 text-slate-500">
-            <Badge label={type} variant="primary" />
+          <div className="flex items-baseline gap-2 text-slate-500">
+            <Badge label={company} variant="primary" />
+            <QuestionTypeBadge type={type} />
             <p className="text-xs">
               {timestamp} · {location} · {role}
             </p>
diff --git a/apps/portal/src/components/questions/filter/FilterSection.tsx b/apps/portal/src/components/questions/filter/FilterSection.tsx
index cfb6ba5c..312122c3 100644
--- a/apps/portal/src/components/questions/filter/FilterSection.tsx
+++ b/apps/portal/src/components/questions/filter/FilterSection.tsx
@@ -1,8 +1,5 @@
 import { MagnifyingGlassIcon } from '@heroicons/react/24/outline';
-import { Collapsible, TextInput } from '@tih/ui';
-
-import Checkbox from '../ui-patch/Checkbox';
-import RadioGroup from '../ui-patch/RadioGroup';
+import { CheckboxInput, Collapsible, RadioList, TextInput } from '@tih/ui';
 
 export type FilterOption<V extends string = string> = {
   checked: boolean;
@@ -66,17 +63,29 @@ export default function FilterSection<
             />
           )}
           {isSingleSelect ? (
-            <RadioGroup
-              radioData={options}
-              onChange={(value) => {
-                onOptionChange(value);
-              }}></RadioGroup>
+            <div className="px-1.5">
+              <RadioList
+                label=""
+                value={options.find((option) => option.checked)?.value}
+                onChange={(value) => {
+                  onOptionChange(value);
+                }}>
+                {options.map((option) => (
+                  <RadioList.Item
+                    key={option.value}
+                    label={option.label}
+                    value={option.value}
+                  />
+                ))}
+              </RadioList>
+            </div>
           ) : (
-            <div className="mx-1">
+            <div className="px-1.5">
               {options.map((option) => (
-                <Checkbox
+                <CheckboxInput
                   key={option.value}
-                  {...option}
+                  label={option.label}
+                  value={option.checked}
                   onChange={(checked) => {
                     onOptionChange(option.value, checked);
                   }}
diff --git a/apps/portal/src/components/questions/ui-patch/Checkbox.tsx b/apps/portal/src/components/questions/ui-patch/Checkbox.tsx
deleted file mode 100644
index 413c12fe..00000000
--- a/apps/portal/src/components/questions/ui-patch/Checkbox.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import { useId } from 'react';
-
-export type CheckboxProps = {
-  checked: boolean;
-  label: string;
-  onChange: (checked: boolean) => void;
-};
-
-export default function Checkbox({ label, checked, onChange }: CheckboxProps) {
-  const id = useId();
-  return (
-    <div className="flex items-center">
-      <input
-        checked={checked}
-        className="text-primary-600 focus:ring-primary-500 h-4 w-4 rounded border-gray-300"
-        id={id}
-        type="checkbox"
-        onChange={(event) => onChange(event.target.checked)}
-      />
-      <label className="ml-3 min-w-0 flex-1 text-gray-700" htmlFor={id}>
-        {label}
-      </label>
-    </div>
-  );
-}
diff --git a/apps/portal/src/components/questions/ui-patch/RadioGroup.tsx b/apps/portal/src/components/questions/ui-patch/RadioGroup.tsx
deleted file mode 100644
index 4b6692c4..00000000
--- a/apps/portal/src/components/questions/ui-patch/RadioGroup.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-export type RadioProps = {
-  onChange: (value: string) => void;
-  radioData: Array<RadioData>;
-};
-
-export type RadioData = {
-  checked: boolean;
-  label: string;
-  value: string;
-};
-
-export default function RadioGroup({ radioData, onChange }: RadioProps) {
-  return (
-    <div className="mx-1 space-y-1">
-      {radioData.map((radio) => (
-        <div key={radio.value} className="flex items-center">
-          <input
-            checked={radio.checked}
-            className="text-primary-600 focus:ring-primary-500 h-4 w-4 border-gray-300"
-            type="radio"
-            value={radio.value}
-            onChange={(event) => {
-              const target = event.target as HTMLInputElement;
-              onChange(target.value);
-            }}
-          />
-          <label
-            className="ml-3 min-w-0 flex-1 text-gray-700"
-            htmlFor={radio.value}>
-            {radio.label}
-          </label>
-        </div>
-      ))}
-    </div>
-  );
-}
diff --git a/apps/portal/src/pages/questions/[questionId]/[questionSlug]/answer/[answerId]/[answerSlug]/index.tsx b/apps/portal/src/pages/questions/[questionId]/[questionSlug]/answer/[answerId]/[answerSlug]/index.tsx
index aac0a7a2..0804f60e 100644
--- a/apps/portal/src/pages/questions/[questionId]/[questionSlug]/answer/[answerId]/[answerSlug]/index.tsx
+++ b/apps/portal/src/pages/questions/[questionId]/[questionSlug]/answer/[answerId]/[answerSlug]/index.tsx
@@ -3,14 +3,10 @@ import { useForm } from 'react-hook-form';
 import { ArrowSmallLeftIcon } from '@heroicons/react/24/outline';
 import { Button, Select, TextArea } from '@tih/ui';
 
+import AnswerCommentListItem from '~/components/questions/AnswerCommentListItem';
 import FullAnswerCard from '~/components/questions/card/FullAnswerCard';
-import CommentListItem from '~/components/questions/CommentListItem';
 import FullScreenSpinner from '~/components/questions/FullScreenSpinner';
 
-import {
-  SAMPLE_ANSWER,
-  SAMPLE_ANSWER_COMMENT,
-} from '~/utils/questions/constants';
 import { useFormRegister } from '~/utils/questions/useFormRegister';
 import { trpc } from '~/utils/trpc';
 
@@ -47,7 +43,7 @@ export default function QuestionPage() {
     'questions.answers.comments.create',
     {
       onSuccess: () => {
-        utils.invalidateQuery([
+        utils.invalidateQueries([
           'questions.answers.comments.getAnswerComments',
           { answerId: answerId as string },
         ]);
@@ -85,11 +81,12 @@ export default function QuestionPage() {
       <div className="flex w-full  justify-center overflow-y-auto py-4 px-5">
         <div className="flex max-w-7xl flex-1 flex-col gap-2">
           <FullAnswerCard
-            authorImageUrl={SAMPLE_ANSWER.authorImageUrl}
+            answerId={answer.id}
+            authorImageUrl={answer.userImage}
             authorName={answer.user}
             content={answer.content}
             createdAt={answer.createdAt}
-            upvoteCount={0}
+            upvoteCount={answer.numVotes}
           />
           <div className="mx-2">
             <form
@@ -142,9 +139,10 @@ export default function QuestionPage() {
             </form>
 
             {(comments ?? []).map((comment) => (
-              <CommentListItem
+              <AnswerCommentListItem
                 key={comment.id}
-                authorImageUrl={SAMPLE_ANSWER_COMMENT.authorImageUrl}
+                answerCommentId={comment.id}
+                authorImageUrl={comment.userImage}
                 authorName={comment.user}
                 content={comment.content}
                 createdAt={comment.createdAt}
diff --git a/apps/portal/src/pages/questions/[questionId]/[questionSlug]/index.tsx b/apps/portal/src/pages/questions/[questionId]/[questionSlug]/index.tsx
index 92149e81..e07227ff 100644
--- a/apps/portal/src/pages/questions/[questionId]/[questionSlug]/index.tsx
+++ b/apps/portal/src/pages/questions/[questionId]/[questionSlug]/index.tsx
@@ -3,15 +3,11 @@ import { useForm } from 'react-hook-form';
 import { ArrowSmallLeftIcon } from '@heroicons/react/24/outline';
 import { Button, Collapsible, Select, TextArea } from '@tih/ui';
 
-import AnswerCard from '~/components/questions/card/AnswerCard';
+import AnswerCommentListItem from '~/components/questions/AnswerCommentListItem';
 import FullQuestionCard from '~/components/questions/card/FullQuestionCard';
-import CommentListItem from '~/components/questions/CommentListItem';
+import QuestionAnswerCard from '~/components/questions/card/QuestionAnswerCard';
 import FullScreenSpinner from '~/components/questions/FullScreenSpinner';
 
-import {
-  SAMPLE_ANSWER,
-  SAMPLE_QUESTION_COMMENT,
-} from '~/utils/questions/constants';
 import createSlug from '~/utils/questions/createSlug';
 import { useFormRegister } from '~/utils/questions/useFormRegister';
 import { trpc } from '~/utils/trpc';
@@ -29,6 +25,7 @@ export default function QuestionPage() {
   const {
     register: ansRegister,
     handleSubmit,
+    reset: resetAnswer,
     formState: { isDirty, isValid },
   } = useForm<AnswerQuestionData>({ mode: 'onChange' });
   const answerRegister = useFormRegister(ansRegister);
@@ -86,6 +83,7 @@ export default function QuestionPage() {
       content: data.answerContent,
       questionId: questionId as string,
     });
+    resetAnswer();
   };
 
   const handleSubmitComment = (data: QuestionCommentData) => {
@@ -115,13 +113,16 @@ export default function QuestionPage() {
         <div className="flex max-w-7xl flex-1 flex-col gap-2">
           <FullQuestionCard
             {...question}
-            receivedCount={0} // TODO: Change to actual value
-            showVoteButtons={true}
-            timestamp={question.seenAt.toLocaleDateString()}
+            questionId={question.id}
+            receivedCount={0}
+            timestamp={question.seenAt.toLocaleDateString(undefined, {
+              month: 'short',
+              year: 'numeric',
+            })}
             upvoteCount={question.numVotes}
           />
           <div className="mx-2">
-            <Collapsible label={`${question.numComments} comment(s)`}>
+            <Collapsible label={`${(comments ?? []).length} comment(s)`}>
               <form
                 className="mb-2"
                 onSubmit={handleCommentSubmit(handleSubmitComment)}>
@@ -172,9 +173,10 @@ export default function QuestionPage() {
               </form>
 
               {(comments ?? []).map((comment) => (
-                <CommentListItem
+                <AnswerCommentListItem
                   key={comment.id}
-                  authorImageUrl={SAMPLE_QUESTION_COMMENT.authorImageUrl}
+                  answerCommentId={comment.id}
+                  authorImageUrl={comment.userImage}
                   authorName={comment.user}
                   content={comment.content}
                   createdAt={comment.createdAt}
@@ -196,7 +198,7 @@ export default function QuestionPage() {
             />
             <div className="mt-3 mb-1 flex justify-between">
               <div className="flex items-baseline justify-start gap-2">
-                <p>{question.numAnswers} answers</p>
+                <p>{(answers ?? []).length} answers</p>
                 <div className="flex items-baseline gap-2">
                   <span aria-hidden={true} className="text-sm">
                     Sort by:
@@ -232,9 +234,10 @@ export default function QuestionPage() {
             </div>
           </form>
           {(answers ?? []).map((answer) => (
-            <AnswerCard
+            <QuestionAnswerCard
               key={answer.id}
-              authorImageUrl={SAMPLE_ANSWER.authorImageUrl}
+              answerId={answer.id}
+              authorImageUrl={answer.userImage}
               authorName={answer.user}
               commentCount={answer.numComments}
               content={answer.content}
diff --git a/apps/portal/src/pages/questions/index.tsx b/apps/portal/src/pages/questions/index.tsx
index 826a6204..93ac9725 100644
--- a/apps/portal/src/pages/questions/index.tsx
+++ b/apps/portal/src/pages/questions/index.tsx
@@ -1,7 +1,9 @@
 import { subMonths, subYears } from 'date-fns';
-import { useRouter } from 'next/router';
+import Router, { useRouter } from 'next/router';
 import { useEffect, useMemo, useState } from 'react';
+import { NoSymbolIcon } from '@heroicons/react/24/outline';
 import type { QuestionsQuestionType } from '@prisma/client';
+import { SlideOut } from '@tih/ui';
 
 import QuestionOverviewCard from '~/components/questions/card/QuestionOverviewCard';
 import ContributeQuestionCard from '~/components/questions/ContributeQuestionCard';
@@ -59,17 +61,22 @@ export default function QuestionsHomePage() {
       : undefined;
   }, [selectedQuestionAge]);
 
-  const { data: questions } = trpc.useQuery([
-    'questions.questions.getQuestionsByFilter',
+  const { data: questions } = trpc.useQuery(
+    [
+      'questions.questions.getQuestionsByFilter',
+      {
+        companies: selectedCompanies,
+        endDate: today,
+        locations: selectedLocations,
+        questionTypes: selectedQuestionTypes,
+        roles: [],
+        startDate,
+      },
+    ],
     {
-      companies: selectedCompanies,
-      endDate: today,
-      locations: selectedLocations,
-      questionTypes: selectedQuestionTypes,
-      roles: [],
-      startDate,
+      keepPreviousData: true,
     },
-  ]);
+  );
 
   const utils = trpc.useContext();
   const { mutate: createQuestion } = trpc.useMutation(
@@ -83,6 +90,7 @@ export default function QuestionsHomePage() {
 
   const [hasLanded, setHasLanded] = useState(false);
   const [loaded, setLoaded] = useState(false);
+  const [filterDrawerOpen, setFilterDrawerOpen] = useState(false);
 
   const companyFilterOptions = useMemo(() => {
     return COMPANIES.map((company) => ({
@@ -112,8 +120,9 @@ export default function QuestionsHomePage() {
     }));
   }, [selectedLocations]);
 
-  const handleLandingQuery = (data: LandingQueryData) => {
+  const handleLandingQuery = async (data: LandingQueryData) => {
     const { company, location, questionType } = data;
+
     setSelectedCompanies([company]);
     setSelectedLocations([location]);
     setSelectedQuestionTypes([questionType as QuestionsQuestionType]);
@@ -134,98 +143,112 @@ export default function QuestionsHomePage() {
     areLocationsInitialized,
   ]);
 
+  const { pathname } = router;
   useEffect(() => {
     if (areFiltersInitialized) {
+      // Router.replace used instead of router.replace to avoid
+      // the page reloading itself since the router.replace
+      // callback changes on every page load
+      Router.replace({
+        pathname,
+        query: {
+          companies: selectedCompanies,
+          locations: selectedLocations,
+          questionAge: selectedQuestionAge,
+          questionTypes: selectedQuestionTypes,
+        },
+      });
       const hasFilter =
-        router.query.companies ||
-        router.query.questionTypes ||
-        router.query.questionAge ||
-        router.query.locations;
+        selectedCompanies.length > 0 ||
+        selectedLocations.length > 0 ||
+        selectedQuestionAge !== 'all' ||
+        selectedQuestionTypes.length > 0;
       if (hasFilter) {
         setHasLanded(true);
       }
-      // Console.log('landed', hasLanded);
+
       setLoaded(true);
     }
-  }, [areFiltersInitialized, hasLanded, router.query]);
+  }, [
+    areFiltersInitialized,
+    hasLanded,
+    loaded,
+    pathname,
+    selectedCompanies,
+    selectedLocations,
+    selectedQuestionAge,
+    selectedQuestionTypes,
+  ]);
 
   if (!loaded) {
     return null;
   }
+  const filterSidebar = (
+    <div className="mt-2 divide-y divide-slate-200 px-4">
+      <FilterSection
+        label="Company"
+        options={companyFilterOptions}
+        searchPlaceholder="Add company filter"
+        onOptionChange={(optionValue, checked) => {
+          if (checked) {
+            setSelectedCompanies([...selectedCompanies, optionValue]);
+          } else {
+            setSelectedCompanies(
+              selectedCompanies.filter((company) => company !== optionValue),
+            );
+          }
+        }}
+      />
+      <FilterSection
+        label="Question types"
+        options={questionTypeFilterOptions}
+        showAll={true}
+        onOptionChange={(optionValue, checked) => {
+          if (checked) {
+            setSelectedQuestionTypes([...selectedQuestionTypes, optionValue]);
+          } else {
+            setSelectedQuestionTypes(
+              selectedQuestionTypes.filter(
+                (questionType) => questionType !== optionValue,
+              ),
+            );
+          }
+        }}
+      />
+      <FilterSection
+        isSingleSelect={true}
+        label="Question age"
+        options={questionAgeFilterOptions}
+        showAll={true}
+        onOptionChange={(optionValue) => {
+          setSelectedQuestionAge(optionValue);
+        }}
+      />
+      <FilterSection
+        label="Location"
+        options={locationFilterOptions}
+        searchPlaceholder="Add location filter"
+        onOptionChange={(optionValue, checked) => {
+          if (checked) {
+            setSelectedLocations([...selectedLocations, optionValue]);
+          } else {
+            setSelectedLocations(
+              selectedLocations.filter((location) => location !== optionValue),
+            );
+          }
+        }}
+      />
+    </div>
+  );
 
   return !hasLanded ? (
     <LandingComponent onLanded={handleLandingQuery}></LandingComponent>
   ) : (
-    <main className="flex flex-1 flex-col items-stretch overflow-y-auto">
-      <div className="flex pt-4">
-        <aside className="w-[300px] border-r px-4">
-          <h2 className="text-xl font-semibold">Filter by</h2>
-          <div className="divide-y divide-slate-200">
-            <FilterSection
-              label="Company"
-              options={companyFilterOptions}
-              searchPlaceholder="Add company filter"
-              onOptionChange={(optionValue, checked) => {
-                if (checked) {
-                  setSelectedCompanies([...selectedCompanies, optionValue]);
-                } else {
-                  setSelectedCompanies(
-                    selectedCompanies.filter(
-                      (company) => company !== optionValue,
-                    ),
-                  );
-                }
-              }}
-            />
-            <FilterSection
-              label="Question types"
-              options={questionTypeFilterOptions}
-              showAll={true}
-              onOptionChange={(optionValue, checked) => {
-                if (checked) {
-                  setSelectedQuestionTypes([
-                    ...selectedQuestionTypes,
-                    optionValue,
-                  ]);
-                } else {
-                  setSelectedQuestionTypes(
-                    selectedQuestionTypes.filter(
-                      (questionType) => questionType !== optionValue,
-                    ),
-                  );
-                }
-              }}
-            />
-            <FilterSection
-              isSingleSelect={true}
-              label="Question age"
-              options={questionAgeFilterOptions}
-              showAll={true}
-              onOptionChange={(optionValue) => {
-                setSelectedQuestionAge(optionValue);
-              }}
-            />
-            <FilterSection
-              label="Location"
-              options={locationFilterOptions}
-              searchPlaceholder="Add location filter"
-              onOptionChange={(optionValue, checked) => {
-                if (checked) {
-                  setSelectedLocations([...selectedLocations, optionValue]);
-                } else {
-                  setSelectedLocations(
-                    selectedLocations.filter(
-                      (location) => location !== optionValue,
-                    ),
-                  );
-                }
-              }}
-            />
-          </div>
-        </aside>
-        <section className="flex min-h-0 flex-1 flex-col items-center overflow-auto pt-4">
-          <div className="flex min-h-0 max-w-3xl flex-1">
-            <div className="flex flex-1 flex-col items-stretch justify-start gap-4 pb-4">
+    <main className="flex flex-1 flex-col items-stretch">
+      <div className="flex h-full flex-1">
+        <section className="flex min-h-0 flex-1 flex-col items-center overflow-auto">
+          <div className="flex min-h-0 max-w-3xl flex-1 p-4">
+            <div className="flex flex-1 flex-col items-stretch justify-start gap-4">
               <ContributeQuestionCard
                 onSubmit={(data) => {
                   createQuestion({
@@ -250,6 +273,9 @@ export default function QuestionsHomePage() {
                   },
                 ]}
                 sortValue="most-recent"
+                onFilterOptionsToggle={() => {
+                  setFilterDrawerOpen(!filterDrawerOpen);
+                }}
                 onSortChange={(value) => {
                   // eslint-disable-next-line no-console
                   console.log(value);
@@ -257,24 +283,49 @@ export default function QuestionsHomePage() {
               />
               {(questions ?? []).map((question) => (
                 <QuestionOverviewCard
-                  // eslint-disable-next-line react/no-array-index-key
                   key={question.id}
                   answerCount={question.numAnswers}
+                  company={question.company}
                   content={question.content}
                   href={`/questions/${question.id}/${createSlug(
                     question.content,
                   )}`}
                   location={question.location}
-                  receivedCount={0} // TODO: Implement received count
+                  questionId={question.id}
+                  receivedCount={0}
                   role={question.role}
-                  timestamp={question.seenAt.toLocaleDateString()}
-                  type={question.type}
+                  timestamp={question.seenAt.toLocaleDateString(undefined, {
+                    month: 'short',
+                    year: 'numeric',
+                  })}
+                  type={question.type} // TODO: Implement received count
                   upvoteCount={question.numVotes}
                 />
               ))}
+              {questions?.length === 0 && (
+                <div className="flex w-full items-center justify-center gap-2 rounded-md border border-slate-300 bg-slate-200 p-4 text-slate-600">
+                  <NoSymbolIcon className="h-6 w-6" />
+                  <p>Nothing found. Try changing your search filters.</p>
+                </div>
+              )}
             </div>
           </div>
         </section>
+        <aside className="hidden w-[300px] overflow-y-auto border-l bg-white py-4 lg:block">
+          <h2 className="px-4 text-xl font-semibold">Filter by</h2>
+          {filterSidebar}
+        </aside>
+        <SlideOut
+          className="lg:hidden"
+          enterFrom="end"
+          isShown={filterDrawerOpen}
+          size="sm"
+          title="Filter by"
+          onClose={() => {
+            setFilterDrawerOpen(false);
+          }}>
+          {filterSidebar}
+        </SlideOut>
       </div>
     </main>
   );
diff --git a/apps/portal/src/server/router/questions-answer-comment-router.ts b/apps/portal/src/server/router/questions-answer-comment-router.ts
index 51d17d34..f75195c7 100644
--- a/apps/portal/src/server/router/questions-answer-comment-router.ts
+++ b/apps/portal/src/server/router/questions-answer-comment-router.ts
@@ -17,6 +17,7 @@ export const questionsAnswerCommentRouter = createProtectedRouter()
           include: {
             user: {
               select: {
+                image: true,
                 name: true,
               },
             },
@@ -54,6 +55,7 @@ export const questionsAnswerCommentRouter = createProtectedRouter()
           numVotes: votes,
           updatedAt: data.updatedAt,
           user: data.user?.name ?? '',
+          userImage: data.user?.image ?? '',
         };
         return answerComment;
       });
@@ -182,7 +184,7 @@ export const questionsAnswerCommentRouter = createProtectedRouter()
           },
         });
 
-      if (voteToUpdate?.id !== userId) {
+      if (voteToUpdate?.userId !== userId) {
         throw new TRPCError({
           code: 'UNAUTHORIZED',
           message: 'User have no authorization to record.',
@@ -213,7 +215,7 @@ export const questionsAnswerCommentRouter = createProtectedRouter()
           },
         });
 
-      if (voteToDelete?.id !== userId) {
+      if (voteToDelete?.userId !== userId) {
         throw new TRPCError({
           code: 'UNAUTHORIZED',
           message: 'User have no authorization to record.',
diff --git a/apps/portal/src/server/router/questions-answer-router.ts b/apps/portal/src/server/router/questions-answer-router.ts
index 21095bf7..7dadbeb4 100644
--- a/apps/portal/src/server/router/questions-answer-router.ts
+++ b/apps/portal/src/server/router/questions-answer-router.ts
@@ -21,6 +21,7 @@ export const questionsAnswerRouter = createProtectedRouter()
           },
           user: {
             select: {
+              image: true,
               name: true,
             },
           },
@@ -58,6 +59,7 @@ export const questionsAnswerRouter = createProtectedRouter()
           numComments: data._count.comments,
           numVotes: votes,
           user: data.user?.name ?? '',
+          userImage: data.user?.image ?? '',
         };
         return answer;
       });
@@ -77,6 +79,7 @@ export const questionsAnswerRouter = createProtectedRouter()
           },
           user: {
             select: {
+              image: true,
               name: true,
             },
           },
@@ -116,6 +119,7 @@ export const questionsAnswerRouter = createProtectedRouter()
         numComments: answerData._count.comments,
         numVotes: votes,
         user: answerData.user?.name ?? '',
+        userImage: answerData.user?.image ?? '',
       };
       return answer;
     },
@@ -241,7 +245,7 @@ export const questionsAnswerRouter = createProtectedRouter()
         },
       });
 
-      if (voteToUpdate?.id !== userId) {
+      if (voteToUpdate?.userId !== userId) {
         throw new TRPCError({
           code: 'UNAUTHORIZED',
           message: 'User have no authorization to record.',
@@ -271,7 +275,7 @@ export const questionsAnswerRouter = createProtectedRouter()
         },
       });
 
-      if (voteToDelete?.id !== userId) {
+      if (voteToDelete?.userId !== userId) {
         throw new TRPCError({
           code: 'UNAUTHORIZED',
           message: 'User have no authorization to record.',
diff --git a/apps/portal/src/server/router/questions-question-comment-router.ts b/apps/portal/src/server/router/questions-question-comment-router.ts
index 82345f06..f3985f31 100644
--- a/apps/portal/src/server/router/questions-question-comment-router.ts
+++ b/apps/portal/src/server/router/questions-question-comment-router.ts
@@ -17,6 +17,7 @@ export const questionsQuestionCommentRouter = createProtectedRouter()
           include: {
             user: {
               select: {
+                image: true,
                 name: true,
               },
             },
@@ -53,6 +54,7 @@ export const questionsQuestionCommentRouter = createProtectedRouter()
           id: data.id,
           numVotes: votes,
           user: data.user?.name ?? '',
+          userImage: data.user?.image ?? '',
         };
         return questionComment;
       });
@@ -181,7 +183,7 @@ export const questionsQuestionCommentRouter = createProtectedRouter()
           },
         });
 
-      if (voteToUpdate?.id !== userId) {
+      if (voteToUpdate?.userId !== userId) {
         throw new TRPCError({
           code: 'UNAUTHORIZED',
           message: 'User have no authorization to record.',
@@ -212,7 +214,7 @@ export const questionsQuestionCommentRouter = createProtectedRouter()
           },
         });
 
-      if (voteToDelete?.id !== userId) {
+      if (voteToDelete?.userId !== userId) {
         throw new TRPCError({
           code: 'UNAUTHORIZED',
           message: 'User have no authorization to record.',
diff --git a/apps/portal/src/server/router/questions-question-router.ts b/apps/portal/src/server/router/questions-question-router.ts
index 39dafd98..2cb564d3 100644
--- a/apps/portal/src/server/router/questions-question-router.ts
+++ b/apps/portal/src/server/router/questions-question-router.ts
@@ -335,7 +335,7 @@ export const questionsQuestionRouter = createProtectedRouter()
         },
       });
 
-      if (voteToUpdate?.id !== userId) {
+      if (voteToUpdate?.userId !== userId) {
         throw new TRPCError({
           code: 'UNAUTHORIZED',
           message: 'User have no authorization to record.',
@@ -365,7 +365,7 @@ export const questionsQuestionRouter = createProtectedRouter()
         },
       });
 
-      if (voteToDelete?.id !== userId) {
+      if (voteToDelete?.userId !== userId) {
         throw new TRPCError({
           code: 'UNAUTHORIZED',
           message: 'User have no authorization to record.',
diff --git a/apps/portal/src/types/questions.d.ts b/apps/portal/src/types/questions.d.ts
index 3797bf38..41286249 100644
--- a/apps/portal/src/types/questions.d.ts
+++ b/apps/portal/src/types/questions.d.ts
@@ -21,6 +21,7 @@ export type AnswerComment = {
   numVotes: number;
   updatedAt: Date;
   user: string;
+  userImage: string;
 };
 
 export type Answer = {
@@ -30,6 +31,7 @@ export type Answer = {
   numComments: number;
   numVotes: number;
   user: string;
+  userImage: string;
 };
 
 export type QuestionComment = {
@@ -38,4 +40,5 @@ export type QuestionComment = {
   id: string;
   numVotes: number;
   user: string;
+  userImage: string;
 };
diff --git a/apps/portal/src/utils/questions/useSearchFilter.ts b/apps/portal/src/utils/questions/useSearchFilter.ts
index 1a7bd199..0b916261 100644
--- a/apps/portal/src/utils/questions/useSearchFilter.ts
+++ b/apps/portal/src/utils/questions/useSearchFilter.ts
@@ -27,13 +27,6 @@ export const useSearchFilter = <Value extends string = string>(
         if (localStorageValue !== null) {
           const loadedFilters = JSON.parse(localStorageValue);
           setFilters(loadedFilters);
-          router.replace({
-            pathname: router.pathname,
-            query: {
-              ...router.query,
-              [name]: loadedFilters,
-            },
-          });
         }
       }
       setIsInitialized(true);
@@ -44,15 +37,8 @@ export const useSearchFilter = <Value extends string = string>(
     (newFilters: Array<Value>) => {
       setFilters(newFilters);
       localStorage.setItem(name, JSON.stringify(newFilters));
-      router.replace({
-        pathname: router.pathname,
-        query: {
-          ...router.query,
-          [name]: newFilters,
-        },
-      });
     },
-    [name, router],
+    [name],
   );
 
   return [filters, setFiltersCallback, isInitialized] as const;
@@ -73,9 +59,7 @@ export const useSearchFilterSingle = <Value extends string = string>(
 
   return [
     filters[0],
-    (value: Value) => {
-      setFilters([value]);
-    },
+    (value: Value) => setFilters([value]),
     isInitialized,
   ] as const;
 };
diff --git a/apps/portal/src/utils/questions/useVote.ts b/apps/portal/src/utils/questions/useVote.ts
new file mode 100644
index 00000000..e71a6a62
--- /dev/null
+++ b/apps/portal/src/utils/questions/useVote.ts
@@ -0,0 +1,175 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { useCallback } from 'react';
+import type { Vote } from '@prisma/client';
+
+import { trpc } from '../trpc';
+
+type UseVoteOptions = {
+  createVote: (opts: { vote: Vote }) => void;
+  deleteVote: (opts: { id: string }) => void;
+  updateVote: (opts: BackendVote) => void;
+};
+
+type BackendVote = {
+  id: string;
+  vote: Vote;
+};
+
+const createVoteCallbacks = (
+  vote: BackendVote | null,
+  opts: UseVoteOptions,
+) => {
+  const { createVote, updateVote, deleteVote } = opts;
+
+  const handleUpvote = () => {
+    // Either upvote or remove upvote
+    if (vote) {
+      if (vote.vote === 'DOWNVOTE') {
+        updateVote({
+          id: vote.id,
+          vote: 'UPVOTE',
+        });
+      } else {
+        deleteVote({
+          id: vote.id,
+        });
+      }
+      // Update vote to an upvote
+    } else {
+      createVote({
+        vote: 'UPVOTE',
+      });
+    }
+  };
+
+  const handleDownvote = () => {
+    // Either downvote or remove downvote
+    if (vote) {
+      if (vote.vote === 'UPVOTE') {
+        updateVote({
+          id: vote.id,
+          vote: 'DOWNVOTE',
+        });
+      } else {
+        deleteVote({
+          id: vote.id,
+        });
+      }
+      // Update vote to an upvote
+    } else {
+      createVote({
+        vote: 'DOWNVOTE',
+      });
+    }
+  };
+
+  return { handleDownvote, handleUpvote };
+};
+
+type MutationKey = Parameters<typeof trpc.useMutation>[0];
+type QueryKey = Parameters<typeof trpc.useQuery>[0][0];
+
+export const useQuestionVote = (id: string) => {
+  return useVote(id, {
+    create: 'questions.questions.createVote',
+    deleteKey: 'questions.questions.deleteVote',
+    idKey: 'questionId',
+    query: 'questions.questions.getVote',
+    update: 'questions.questions.updateVote',
+  });
+};
+
+export const useAnswerVote = (id: string) => {
+  return useVote(id, {
+    create: 'questions.answers.createVote',
+    deleteKey: 'questions.answers.deleteVote',
+    idKey: 'answerId',
+    query: 'questions.answers.getVote',
+    update: 'questions.answers.updateVote',
+  });
+};
+
+export const useQuestionCommentVote = (id: string) => {
+  return useVote(id, {
+    create: 'questions.questions.comments.createVote',
+    deleteKey: 'questions.questions.comments.deleteVote',
+    idKey: 'questionCommentId',
+    query: 'questions.questions.comments.getVote',
+    update: 'questions.questions.comments.updateVote',
+  });
+};
+
+export const useAnswerCommentVote = (id: string) => {
+  return useVote(id, {
+    create: 'questions.answers.comments.createVote',
+    deleteKey: 'questions.answers.comments.deleteVote',
+    idKey: 'answerCommentId',
+    query: 'questions.answers.comments.getVote',
+    update: 'questions.answers.comments.updateVote',
+  });
+};
+
+type VoteProps<VoteQueryKey extends QueryKey = QueryKey> = {
+  create: MutationKey;
+  deleteKey: MutationKey;
+  idKey: string;
+  query: VoteQueryKey;
+  update: MutationKey;
+};
+
+export const useVote = <VoteQueryKey extends QueryKey = QueryKey>(
+  id: string,
+  opts: VoteProps<VoteQueryKey>,
+) => {
+  const { create, deleteKey, query, update, idKey } = opts;
+  const utils = trpc.useContext();
+
+  const onVoteUpdate = useCallback(() => {
+    // TODO: Optimise query invalidation
+    utils.invalidateQueries([query, { [idKey]: id } as any]);
+    utils.invalidateQueries(['questions.questions.getQuestionsByFilter']);
+    utils.invalidateQueries(['questions.questions.getQuestionById']);
+    utils.invalidateQueries(['questions.answers.getAnswers']);
+    utils.invalidateQueries(['questions.answers.getAnswerById']);
+    utils.invalidateQueries([
+      'questions.questions.comments.getQuestionComments',
+    ]);
+    utils.invalidateQueries(['questions.answers.comments.getAnswerComments']);
+  }, [id, idKey, utils, query]);
+
+  const { data } = trpc.useQuery([
+    query,
+    {
+      [idKey]: id,
+    },
+  ] as any);
+
+  const backendVote = data as BackendVote;
+
+  const { mutate: createVote } = trpc.useMutation(create, {
+    onSuccess: onVoteUpdate,
+  });
+  const { mutate: updateVote } = trpc.useMutation(update, {
+    onSuccess: onVoteUpdate,
+  });
+
+  const { mutate: deleteVote } = trpc.useMutation(deleteKey, {
+    onSuccess: onVoteUpdate,
+  });
+
+  const { handleDownvote, handleUpvote } = createVoteCallbacks(
+    backendVote ?? null,
+    {
+      createVote: ({ vote }) => {
+        createVote({
+          [idKey]: id,
+          vote,
+        } as any);
+      },
+      deleteVote,
+      updateVote,
+    },
+  );
+
+  return { handleDownvote, handleUpvote, vote: backendVote ?? null };
+};