diff --git a/frontend/src/components/BatchCard.vue b/frontend/src/components/BatchCard.vue
index ad601ffc..84697c51 100644
--- a/frontend/src/components/BatchCard.vue
+++ b/frontend/src/components/BatchCard.vue
@@ -50,9 +50,9 @@
 					{{ batch.timezone }}
 				</span>
 			</div>
-			<div v-if="batch.instructors.length" class="flex avatar-group overlap">
+			<div v-if="batch.instructors?.length" class="flex avatar-group overlap">
 				<div
-					class="mr-1"
+					class="h-6 mr-1"
 					:class="{ 'avatar-group overlap': batch.instructors.length > 1 }"
 				>
 					<UserAvatar
diff --git a/frontend/src/components/CourseCard.vue b/frontend/src/components/CourseCard.vue
index d52dda74..daf76c4a 100644
--- a/frontend/src/components/CourseCard.vue
+++ b/frontend/src/components/CourseCard.vue
@@ -93,7 +93,7 @@
 			<div class="flex items-center justify-between mt-auto">
 				<div class="flex avatar-group overlap">
 					<div
-						class="mr-1"
+						class="h-6 mr-1"
 						:class="{ 'avatar-group overlap': course.instructors.length > 1 }"
 					>
 						<UserAvatar
diff --git a/frontend/src/pages/Batch.vue b/frontend/src/pages/Batch.vue
index 5f3b0b0d..6143d586 100644
--- a/frontend/src/pages/Batch.vue
+++ b/frontend/src/pages/Batch.vue
@@ -15,7 +15,7 @@
 		</header>
 		<div v-if="batch.data" class="grid grid-cols-[70%,30%] h-screen">
 			<div class="border-r-2">
-				<Tabs v-model="tabIndex" :tabs="tabs" tablistClass="overflow-x-visible">
+				<Tabs v-model="tabIndex" :tabs="tabs" tablistClass="overflow-y-hidden">
 					<template #tab="{ tab, selected }" class="overflow-x-hidden">
 						<div>
 							<button
@@ -84,7 +84,7 @@
 
 				<div class="flex avatar-group overlap mb-5">
 					<div
-						class="mr-1"
+						class="h-6 mr-1"
 						:class="{
 							'avatar-group overlap': batch.data.instructors.length > 1,
 						}"
diff --git a/frontend/src/pages/BatchDetail.vue b/frontend/src/pages/BatchDetail.vue
index 2aad5c31..3724b5fd 100644
--- a/frontend/src/pages/BatchDetail.vue
+++ b/frontend/src/pages/BatchDetail.vue
@@ -38,7 +38,7 @@
 				</div>
 				<div class="flex avatar-group overlap mt-3">
 					<div
-						class="mr-1"
+						class="h-6 mr-1"
 						:class="{
 							'avatar-group overlap': batch.data.instructors.length > 1,
 						}"
diff --git a/frontend/src/pages/CourseDetail.vue b/frontend/src/pages/CourseDetail.vue
index db9c77d4..386b7777 100644
--- a/frontend/src/pages/CourseDetail.vue
+++ b/frontend/src/pages/CourseDetail.vue
@@ -41,7 +41,7 @@
 						>
 						<div class="flex items-center">
 							<span
-								class="mr-1"
+								class="h-6 mr-1"
 								:class="{
 									'avatar-group overlap': course.data.instructors.length > 1,
 								}"
diff --git a/frontend/src/pages/Lesson.vue b/frontend/src/pages/Lesson.vue
index 1039c3bb..721bcddd 100644
--- a/frontend/src/pages/Lesson.vue
+++ b/frontend/src/pages/Lesson.vue
@@ -95,7 +95,7 @@
 
 				<div class="flex items-center mt-2">
 					<span
-						class="mr-1"
+						class="h-6 mr-1"
 						:class="{
 							'avatar-group overlap': lesson.data.instructors.length > 1,
 						}"