diff --git a/frontend/src/pages/Lesson.vue b/frontend/src/pages/Lesson.vue
index 010db1f9..23e0249a 100644
--- a/frontend/src/pages/Lesson.vue
+++ b/frontend/src/pages/Lesson.vue
@@ -18,6 +18,51 @@
 					</template>
 				</Button>
 				<CertificationLinks :courseName="courseName" />
+				<Button v-if="lesson.data.prev" @click="switchLesson('prev')">
+					<template #prefix>
+						<ChevronLeft class="w-4 h-4 stroke-1" />
+					</template>
+					<span>
+						{{ __('Previous') }}
+					</span>
+				</Button>
+
+				<router-link
+					v-if="allowEdit()"
+					:to="{
+						name: 'LessonForm',
+						params: {
+							courseName: courseName,
+							chapterNumber: props.chapterNumber,
+							lessonNumber: props.lessonNumber,
+						},
+					}"
+				>
+					<Button>
+						{{ __('Edit') }}
+					</Button>
+				</router-link>
+
+				<Button v-if="lesson.data.next" @click="switchLesson('next')">
+					<template #suffix>
+						<ChevronRight class="w-4 h-4 stroke-1" />
+					</template>
+					<span>
+						{{ __('Next') }}
+					</span>
+				</Button>
+
+				<router-link
+					v-else
+					:to="{
+						name: 'CourseDetail',
+						params: { courseName: courseName },
+					}"
+				>
+					<Button>
+						{{ __('Back to Course') }}
+					</Button>
+				</router-link>
 			</div>
 		</header>
 		<div class="grid md:grid-cols-[70%,30%] h-screen">
@@ -100,11 +145,11 @@
 								</div>
 							</div>
 
-							<div class="flex items-center space-x-2 mt-2 md:mt-0">
-								<Button
-									v-if="zenModeEnabled"
-									@click="showDiscussionsInZenMode()"
-								>
+							<div
+								v-if="zenModeEnabled"
+								class="flex items-center space-x-2 mt-2 md:mt-0"
+							>
+								<Button @click="showDiscussionsInZenMode()">
 									<template #icon>
 										<MessageCircleQuestion class="w-4 h-4 stroke-1.5" />
 									</template>