diff --git a/packages/api/src/types/OptionUsersType.ts b/packages/api/src/types/OptionUsersType.ts
index 8c5a2fa9..b2d844a4 100644
--- a/packages/api/src/types/OptionUsersType.ts
+++ b/packages/api/src/types/OptionUsersType.ts
@@ -1,11 +1,23 @@
-import { GetGroupsResponse } from './GroupType';
-import { GetUserResponse } from './UserType';
-
 export type GetOptionUsersResponse = {
   optionId: string;
   registrationId: string | null;
   userId: string | null;
-  user: GetUserResponse | null;
+  user: {
+    id: string;
+    username: string;
+    firstName: string;
+    lastName: string;
+  } | null;
   groupId: string | null;
-  group: GetGroupsResponse | null;
+  group: {
+    id: null;
+    users:
+      | {
+          id: string;
+          username: string;
+          firstName: string;
+          lastName: string;
+        }[]
+      | null;
+  } | null;
 };
diff --git a/packages/berlin/src/components/header/Header.tsx b/packages/berlin/src/components/header/Header.tsx
index 1123443e..f51d1675 100644
--- a/packages/berlin/src/components/header/Header.tsx
+++ b/packages/berlin/src/components/header/Header.tsx
@@ -113,14 +113,14 @@ function Header() {
                             )
                           );
                         })}
+                      <NavButton to={`/events/${events?.[0].id}/register`} $color="secondary">
+                        My proposals
+                      </NavButton>
                       <NavButton to={`/events/${events?.[0].id}/cycles`} $color="secondary">
                         Agenda
                       </NavButton>
                     </>
                   )}
-                  <NavButton to={`/events/${events?.[0].id}/register`} $color="secondary">
-                    My proposals
-                  </NavButton>
                   <Button onClick={() => mutateLogout()}>Log out</Button>
                   <IconButton
                     onClick={() => navigate('/account')}
diff --git a/packages/berlin/src/components/option-card/OptionCard.tsx b/packages/berlin/src/components/option-card/OptionCard.tsx
index 70d32669..d46d441b 100644
--- a/packages/berlin/src/components/option-card/OptionCard.tsx
+++ b/packages/berlin/src/components/option-card/OptionCard.tsx
@@ -12,9 +12,9 @@ type OptionCardProps = {
   option: QuestionOption;
   numOfVotes: number;
   onVote: () => void;
-  onUnvote: () => void;
+  onUnVote: () => void;
 };
-function OptionCard({ option, numOfVotes, onVote, onUnvote }: OptionCardProps) {
+function OptionCard({ option, numOfVotes, onVote, onUnVote }: OptionCardProps) {
   const { eventId, cycleId } = useParams();
   const theme = useAppStore((state) => state.theme);
   const navigate = useNavigate();
@@ -67,7 +67,7 @@ function OptionCard({ option, numOfVotes, onVote, onUnvote }: OptionCardProps) {
                 $padding={0}
                 $color="secondary"
                 icon={{ src: `/icons/downvote-${theme}.svg`, alt: 'Downvote arrow' }}
-                onClick={onUnvote}
+                onClick={onUnVote}
                 $width={16}
                 $height={16}
                 disabled={numOfVotes === 0}
diff --git a/packages/berlin/src/pages/Comments.tsx b/packages/berlin/src/pages/Comments.tsx
index d0541b95..b0c376bb 100644
--- a/packages/berlin/src/pages/Comments.tsx
+++ b/packages/berlin/src/pages/Comments.tsx
@@ -11,14 +11,19 @@ import {
   fetchUserVotes,
   fetchComments,
   postComment,
-  // fetchOptionUsers,
+  fetchOptionUsers,
 } from 'api';
 
 // Hooks
 import useUser from '../hooks/useUser';
 
 // Utils
-import { handleSaveVotes, handleUnvote, handleVote } from '../utils/voting';
+import {
+  handleSaveVotes,
+  handleAvailableHearts,
+  handleLocalUnVote,
+  handleLocalVote,
+} from '../utils/voting';
 
 // Types
 import { ResponseUserVotesType } from '../types/CycleType';
@@ -40,15 +45,16 @@ import CommentsColumns from '../components/columns/comments-columns';
 import IconButton from '../components/icon-button';
 import Textarea from '../components/textarea';
 
+type LocalUserVotes = ResponseUserVotesType | { optionId: string; numOfVotes: number }[];
+
 function Comments() {
   const theme = useAppStore((state) => state.theme);
   const queryClient = useQueryClient();
   const { cycleId, optionId } = useParams();
   const { user } = useUser();
-  const { availableHearts, setAvailableHearts } = useAppStore((state) => state);
-  const [localUserVotes, setLocalUserVotes] = useState<
-    ResponseUserVotesType | { optionId: string; numOfVotes: number }[]
-  >([]);
+  const availableHearts = useAppStore((state) => state.availableHearts);
+  const setAvailableHearts = useAppStore((state) => state.setAvailableHearts);
+  const [localUserVotes, setLocalUserVotes] = useState<LocalUserVotes>([]);
   const [localOptionHearts, setLocalOptionHearts] = useState(0);
   const [comment, setComment] = useState('');
   const [sortOrder, setSortOrder] = useState('desc'); // 'asc' for ascending, 'desc' for descending
@@ -66,17 +72,17 @@ function Comments() {
     retry: false,
   });
 
-  // const { data: optionUsers } = useQuery({
-  //   queryKey: ['optionUsers', optionId],
-  //   queryFn: () => fetchOptionUsers(optionId || ''),
-  //   enabled: !!optionId,
-  // });
+  const { data: optionUsers } = useQuery({
+    queryKey: ['option', optionId, 'users'],
+    queryFn: () => fetchOptionUsers(optionId || ''),
+    enabled: !!optionId,
+  });
 
   const { data: comments } = useQuery({
-    queryKey: ['comments', optionId],
+    queryKey: ['option', optionId, 'comments'],
     queryFn: () => fetchComments({ optionId: optionId || '' }),
     enabled: !!optionId,
-    refetchInterval: 5000, // Poll every 5 seconds
+    // refetchInterval: 5000, // Poll every 5 seconds
   });
 
   const sortedComments = useMemo(() => {
@@ -97,52 +103,45 @@ function Comments() {
     }
   }, [optionId, userVotes]);
 
-  const { mutate: mutateVotes } = useMutation({
-    mutationFn: postVotes,
-    onSuccess: (body) => {
-      if (body?.errors?.length) {
-        toast.error(`Failed to save votes, ${body?.errors[0].message}`);
-      } else if (body?.data.length) {
-        queryClient.invalidateQueries({ queryKey: ['votes', cycleId] });
-        // this is to update the plural scores in each option
-        queryClient.invalidateQueries({ queryKey: ['cycles', cycleId] });
-        toast.success('Votes saved successfully!');
-      }
-    },
-  });
-
   const { mutate: mutateComments } = useMutation({
     mutationFn: postComment,
     onSuccess: (body) => {
       if (body?.value) {
-        queryClient.invalidateQueries({ queryKey: ['comments', optionId] });
+        queryClient.invalidateQueries({ queryKey: ['option', optionId, 'comments'] });
       }
     },
   });
 
   const handleVoteWrapper = (optionId: string) => {
     setLocalOptionHearts((prevLocalOptionHearts) => prevLocalOptionHearts + 1);
-    handleVote(optionId, availableHearts, setAvailableHearts, setLocalUserVotes);
+    setLocalUserVotes((prevLocalUserVotes) => handleLocalVote(optionId, prevLocalUserVotes));
+    setAvailableHearts(handleAvailableHearts(availableHearts, 'vote'));
   };
 
-  const handleUnvoteWrapper = (optionId: string) => {
+  const handleUnVoteWrapper = (optionId: string) => {
     setLocalOptionHearts((prevLocalOptionHearts) => Math.max(0, prevLocalOptionHearts - 1));
-    handleUnvote(optionId, availableHearts, setAvailableHearts, setLocalUserVotes);
+    setLocalUserVotes((prevLocalUserVotes) => handleLocalUnVote(optionId, prevLocalUserVotes));
+    setAvailableHearts(handleAvailableHearts(availableHearts, 'unVote'));
   };
 
-  const handleSaveVotesWrapper = () => {
+  const { mutate: mutateVotes } = useMutation({
+    mutationFn: postVotes,
+    onSuccess: (body) => {
+      if (body?.errors?.length) {
+        toast.error(`Failed to save votes, ${body?.errors[0].message}`);
+      } else if (body?.data.length) {
+        queryClient.invalidateQueries({ queryKey: ['votes', cycleId] });
+        // this is to update the plural scores in each option
+        queryClient.invalidateQueries({ queryKey: ['cycles', cycleId] });
+        toast.success('Votes saved successfully!');
+      }
+    },
+  });
+
+  const handleSaveVoteWrapper = () => {
     handleSaveVotes(userVotes, localUserVotes, mutateVotes);
   };
 
-  const votesAreDifferent = useMemo(() => {
-    if (localUserVotes && userVotes) {
-      return (
-        localUserVotes[0]?.numOfVotes !==
-        userVotes?.find((vote) => vote.optionId === optionId)?.numOfVotes
-      );
-    }
-  }, [localUserVotes, optionId, userVotes]);
-
   const handlePostComment = () => {
     if (optionId && comment) {
       mutateComments({ questionOptionId: optionId, value: comment });
@@ -173,7 +172,7 @@ function Comments() {
               $padding={0}
               $color="secondary"
               icon={{ src: `/icons/downvote-${theme}.svg`, alt: 'Downvote arrow' }}
-              onClick={() => handleUnvoteWrapper(option?.id ?? '')}
+              onClick={() => handleUnVoteWrapper(option?.id ?? '')}
               $width={16}
               $height={16}
               disabled={localOptionHearts === 0}
@@ -183,17 +182,18 @@ function Comments() {
         </FlexRow>
         <Subtitle>{option?.optionTitle}</Subtitle>
         <Body>{option?.optionSubTitle}</Body>
-        {/* <Body>
-          <Bold>Lead author: {option?.user}</Bold> [// TODO]
-        </Body>
         <Body>
-          <Bold>Co-authors:</Bold> [// TODO]
-        </Body> */}
+          <Bold>Lead author:</Bold> {optionUsers?.user?.firstName} {optionUsers?.user?.lastName}
+        </Body>
+        {optionUsers?.group?.users && (
+          <Body>
+            <Bold>Co-authors:</Bold>{' '}
+            {optionUsers.group.users.map((user) => `${(user.firstName, user.lastName)}`)}
+          </Body>
+        )}
       </FlexColumn>
 
-      <Button onClick={handleSaveVotesWrapper} disabled={!votesAreDifferent}>
-        Save votes
-      </Button>
+      <Button onClick={handleSaveVoteWrapper}>Save votes</Button>
       <Form>
         <Textarea
           label="Leave a comment:"
diff --git a/packages/berlin/src/pages/Cycle.tsx b/packages/berlin/src/pages/Cycle.tsx
index 3c627a7c..04d93b3e 100644
--- a/packages/berlin/src/pages/Cycle.tsx
+++ b/packages/berlin/src/pages/Cycle.tsx
@@ -12,7 +12,12 @@ import useCountdown from '../hooks/useCountdown';
 import useUser from '../hooks/useUser';
 
 // Utils
-import { handleSaveVotes, handleUnvote, handleVote } from '../utils/voting';
+import {
+  handleSaveVotes,
+  handleAvailableHearts,
+  handleLocalUnVote,
+  handleLocalVote,
+} from '../utils/voting';
 
 // Types
 import { ResponseUserVotesType } from '../types/CycleType';
@@ -137,11 +142,13 @@ function Cycle() {
   });
 
   const handleVoteWrapper = (optionId: string) => {
-    handleVote(optionId, availableHearts, setAvailableHearts, setLocalUserVotes);
+    setLocalUserVotes((prevLocalUserVotes) => handleLocalVote(optionId, prevLocalUserVotes));
+    setAvailableHearts(handleAvailableHearts(availableHearts, 'vote'));
   };
 
-  const handleUnvoteWrapper = (optionId: string) => {
-    handleUnvote(optionId, availableHearts, setAvailableHearts, setLocalUserVotes);
+  const handleUnVoteWrapper = (optionId: string) => {
+    setLocalUserVotes((prevLocalUserVotes) => handleLocalUnVote(optionId, prevLocalUserVotes));
+    setAvailableHearts(handleAvailableHearts(availableHearts, 'unVote'));
   };
 
   const handleSaveVotesWrapper = () => {
@@ -243,7 +250,7 @@ function Cycle() {
                 option={option}
                 numOfVotes={numOfVotes}
                 onVote={() => handleVoteWrapper(option.id)}
-                onUnvote={() => handleUnvoteWrapper(option.id)}
+                onUnVote={() => handleUnVoteWrapper(option.id)}
               />
             );
           })}
diff --git a/packages/berlin/src/utils/voting.ts b/packages/berlin/src/utils/voting.ts
index cc824c03..7fa878ec 100644
--- a/packages/berlin/src/utils/voting.ts
+++ b/packages/berlin/src/utils/voting.ts
@@ -2,65 +2,51 @@ import { GetUserVotesResponse, PostVotesRequest } from 'api';
 import { ResponseUserVotesType } from '../types/CycleType';
 import toast from 'react-hot-toast';
 
-export const handleVote = (
+export const handleLocalVote = (
   optionId: string,
-  availableHearts: number,
-  setAvailableHearts: (hearts: number) => void,
-  setLocalUserVotes: React.Dispatch<
-    React.SetStateAction<
-      | ResponseUserVotesType
-      | {
-          optionId: string;
-          numOfVotes: number;
-        }[]
-    >
-  >,
+  prevLocalUserVotes: ResponseUserVotesType | { optionId: string; numOfVotes: number }[],
 ) => {
-  if (availableHearts > 0) {
-    setLocalUserVotes((prevLocalUserVotes) => {
-      const temp = prevLocalUserVotes.find((x) => x.optionId === optionId);
-      if (!temp) {
-        return [...prevLocalUserVotes, { optionId, numOfVotes: 1 }];
-      }
-      const updatedLocalVotes = prevLocalUserVotes.map((prevLocalUserVote) => {
-        if (prevLocalUserVote.optionId === optionId) {
-          return { ...prevLocalUserVote, numOfVotes: prevLocalUserVote.numOfVotes + 1 };
-        }
-        return prevLocalUserVote;
-      });
-      return updatedLocalVotes;
-    });
-    setAvailableHearts(Math.max(0, availableHearts - 1));
+  // find if the user has already voted for this option
+  const prevVote = prevLocalUserVotes.find((x) => x.optionId === optionId);
+  if (!prevVote) {
+    // if the user has not voted for this option, add a new vote
+    return [...prevLocalUserVotes, { optionId, numOfVotes: 1 }];
   }
+
+  // if the user has already voted for this option, update the number of votes
+  // this will just find the option and increase the number of votes by 1
+  const updatedLocalVotes = prevLocalUserVotes.map((prevLocalUserVote) => {
+    if (prevLocalUserVote.optionId === optionId) {
+      return { ...prevLocalUserVote, numOfVotes: prevLocalUserVote.numOfVotes + 1 };
+    }
+    return prevLocalUserVote;
+  });
+
+  return updatedLocalVotes;
 };
 
-export const handleUnvote = (
+export const handleLocalUnVote = (
   optionId: string,
-  availableHearts: number,
-  setAvailableHearts: (hearts: number) => void,
-  setLocalUserVotes: React.Dispatch<
-    React.SetStateAction<
-      | ResponseUserVotesType
-      | {
-          optionId: string;
-          numOfVotes: number;
-        }[]
-    >
-  >,
+  prevLocalUserVotes: ResponseUserVotesType | { optionId: string; numOfVotes: number }[],
 ) => {
-  setLocalUserVotes((prevLocalUserVotes) => {
-    const updatedLocalVotes = prevLocalUserVotes.map((prevLocalUserVote) => {
-      if (prevLocalUserVote.optionId === optionId) {
-        const newNumOfVotes = Math.max(0, prevLocalUserVote.numOfVotes - 1);
-        return { ...prevLocalUserVote, numOfVotes: newNumOfVotes };
-      }
-      return prevLocalUserVote;
-    });
-
-    return updatedLocalVotes;
+  // this will just find the option and decrease the number of votes by 1
+  const updatedLocalVotes = prevLocalUserVotes.map((prevLocalUserVote) => {
+    if (prevLocalUserVote.optionId === optionId) {
+      const newNumOfVotes = Math.max(0, prevLocalUserVote.numOfVotes - 1);
+      return { ...prevLocalUserVote, numOfVotes: newNumOfVotes };
+    }
+    return prevLocalUserVote;
   });
 
-  setAvailableHearts(Math.min(20, availableHearts + 1));
+  return updatedLocalVotes;
+};
+
+export const handleAvailableHearts = (availableHearts: number, type: 'vote' | 'unVote') => {
+  if (type === 'vote') {
+    return Math.max(0, availableHearts - 1);
+  }
+
+  return Math.min(20, availableHearts + 1);
 };
 
 export const handleSaveVotes = (
@@ -82,18 +68,15 @@ export const handleSaveVotes = (
 
       for (const localVote of localUserVotes) {
         const matchingServerVote = serverVotesMap.get(localVote.optionId);
-
-        if (!matchingServerVote) {
-          mutateVotesReq.votes.push({
-            optionId: localVote.optionId,
-            numOfVotes: localVote.numOfVotes,
-          });
-        } else if (matchingServerVote.numOfVotes !== localVote.numOfVotes) {
-          mutateVotesReq.votes.push({
-            optionId: localVote.optionId,
-            numOfVotes: localVote.numOfVotes,
-          });
+        // if the vote is the same as the server vote, we don't need to send it
+        if (matchingServerVote && matchingServerVote.numOfVotes === localVote.numOfVotes) {
+          continue;
         }
+
+        mutateVotesReq.votes.push({
+          optionId: localVote.optionId,
+          numOfVotes: localVote.numOfVotes,
+        });
       }
 
       mutateVotes(mutateVotesReq);