Index: frontend/src/components/StudentForm/StudentForm.tsx
===================================================================
--- frontend/src/components/StudentForm/StudentForm.tsx	(revision 3eb43361eb4cc515a2e51fee88f7cf218094b89b)
+++ frontend/src/components/StudentForm/StudentForm.tsx	(revision 79202a96c87ad560ffa6e5bfdc602b17f3b1eab6)
@@ -572,5 +572,5 @@
 			<div>
 				<h3 className="text-lg font-medium text-gray-900 mb-2">
-					Преферирани начин на оценување
+					Преферирани начини на оценување
 				</h3>
 				<div className="flex flex-wrap gap-2">
Index: frontend/src/components/SubjectCatalog/SubjectList.tsx
===================================================================
--- frontend/src/components/SubjectCatalog/SubjectList.tsx	(revision 3eb43361eb4cc515a2e51fee88f7cf218094b89b)
+++ frontend/src/components/SubjectCatalog/SubjectList.tsx	(revision 79202a96c87ad560ffa6e5bfdc602b17f3b1eab6)
@@ -48,15 +48,19 @@
 						</div> */}
 						<div className="flex justify-between mt-auto gap-3">
-							<button onClick={() => openSubjectDetails(subject)}>
-								<img src="src/assets/eye.svg" className="w-5 h-5" />
-							</button>
-							<FavoriteButton subjectId={subject.id} />
-							<button
-								onClick={() => openSubjectView(subject)}
-								className="flex items-center px-3 py-2 bg-blue-600 hover:bg-blue-900 text-white text-sm font-medium rounded-md transition-colors"
-							>
-								<img src="src/assets/open.svg" className="w-4 h-4 mr-1" />
-								Отвори предмет
-							</button>
+							<div className="flex items-center gap-2">
+								<button onClick={() => openSubjectDetails(subject)}>
+									<img src="src/assets/eye.svg" className="w-5 h-5" />
+								</button>
+								<FavoriteButton subjectId={subject.id} />
+							</div>
+							<div className="flex-1 flex justify-end">
+								<button
+									onClick={() => openSubjectView(subject)}
+									className="flex items-center px-3 py-2 bg-blue-600 hover:bg-blue-900 text-white text-sm font-medium rounded-md transition-colors"
+								>
+									<img src="src/assets/open.svg" className="w-4 h-4 mr-1" />
+									Отвори предмет
+								</button>
+							</div>
 						</div>
 					</div>