diff --git a/frontend/src/components/Controls/Autocomplete.vue b/frontend/src/components/Controls/Autocomplete.vue
index 4b7d4a0d..0563dd61 100644
--- a/frontend/src/components/Controls/Autocomplete.vue
+++ b/frontend/src/components/Controls/Autocomplete.vue
@@ -91,7 +91,7 @@
 												<div>
 													{{ option.label }}
 												</div>
-												<div
+												<div v-if="option.label != option.description"
 													class="text-xs text-gray-700"
 													v-html="option.description"
 												></div>
diff --git a/frontend/src/components/Controls/Link.vue b/frontend/src/components/Controls/Link.vue
index c5f6f63f..f7730380 100644
--- a/frontend/src/components/Controls/Link.vue
+++ b/frontend/src/components/Controls/Link.vue
@@ -77,6 +77,7 @@ const valuePropPassed = computed(() => 'value' in attrs)
 const value = computed({
 	get: () => (valuePropPassed.value ? attrs.value : props.modelValue),
 	set: (val) => {
+		console.log(valuePropPassed.value)
 		return (
 			val?.value &&
 			emit(valuePropPassed.value ? 'change' : 'update:modelValue', val?.value)
diff --git a/frontend/src/components/LessonPlugins.vue b/frontend/src/components/LessonPlugins.vue
index ccaa17cf..e5a4e5af 100644
--- a/frontend/src/components/LessonPlugins.vue
+++ b/frontend/src/components/LessonPlugins.vue
@@ -2,7 +2,7 @@
 	<div class="text-lg font-semibold">
 		{{ __('Components') }}
 	</div>
-	<div class="mt-5">
+	<div class="mt-5 space-y-4">
 		<Tooltip
 			:text="
 				__(
@@ -18,20 +18,28 @@
 				<Select v-model="currentEditor" :options="getEditorOptions()" />
 			</div>
 		</Tooltip>
-		<div class="flex mt-4">
+		<div class="flex">
 			<Link
-				v-model="quiz"
+				:value="quiz"
 				class="flex-1"
 				doctype="LMS Quiz"
-				:label="__('Select a Quiz')"
+				:label="__('Add an existing quiz')"
+				@change="(option) => addQuiz(option)"
 			/>
-			<Button @click="addQuiz()" class="self-end ml-2">
-				<template #icon>
-					<Plus class="h-4 w-4 stroke-1.5" />
-				</template>
-			</Button>
+			<router-link :to="{
+				name: 'QuizCreation',
+				params: {
+					quizID: 'new',
+				}
+			}" class="self-end ml-2">
+				<Button>
+					<template #icon>
+						<Plus class="h-4 w-4 stroke-1.5" />
+					</template>
+				</Button>
+			</router-link>
 		</div>
-		<div class="mt-4">
+		<div class="">
 			<div class="text-xs text-gray-600 mb-1">
 				{{ __('Add an image, video, pdf or audio.') }}
 			</div>
@@ -68,7 +76,7 @@
 				</div>
 			</div>
 		</div>
-		<div class="mt-4">
+		<div class="">
 			<div class="text-xs text-gray-600 mb-1">
 				{{
 					__(
@@ -112,11 +120,13 @@ const props = defineProps({
 	},
 })
 
-const addQuiz = () => {
+const addQuiz = (value) => {
+	console.log("here")
+	console.log(value)
 	getCurrentEditor().caret.setToLastBlock('end', 0)
-	if (quiz.value) {
+	if (value) {
 		getCurrentEditor().blocks.insert('quiz', {
-			quiz: quiz.value,
+			quiz: value,
 		})
 		quiz.value = null
 	}
diff --git a/frontend/src/pages/LessonForm.vue b/frontend/src/pages/LessonForm.vue
index b92ea7d9..b16d4f4d 100644
--- a/frontend/src/pages/LessonForm.vue
+++ b/frontend/src/pages/LessonForm.vue
@@ -70,7 +70,7 @@
 </template>
 <script setup>
 import { Breadcrumbs, FormControl, createResource, Button } from 'frappe-ui'
-import { computed, reactive, onMounted, inject, ref, watch } from 'vue'
+import { computed, reactive, onMounted, inject, ref, onBeforeUnmount } from 'vue'
 import EditorJS from '@editorjs/editorjs'
 import LessonPlugins from '@/components/LessonPlugins.vue'
 import { ChevronRight } from 'lucide-vue-next'
@@ -171,9 +171,13 @@ const addInstructorNotes = (data) => {
 const enableAutoSave = () => {
 	autoSaveInterval = setInterval(() => {
 		saveLesson()
-	}, 10000)
+	}, 5000)
 }
 
+onBeforeUnmount(() => {
+	clearInterval(autoSaveInterval)
+})
+
 const newLessonResource = createResource({
 	url: 'frappe.client.insert',
 	makeParams(values) {
diff --git a/frontend/src/utils/index.js b/frontend/src/utils/index.js
index 05372373..e732e09f 100644
--- a/frontend/src/utils/index.js
+++ b/frontend/src/utils/index.js
@@ -236,7 +236,7 @@ export function getEditorTools() {
 						regex: /https:\/\/docs\.google\.com\/presentation\/d\/e\/([A-Za-z0-9_-]+)\/pub/,
 						embedUrl:
 							'https://docs.google.com/presentation/d/e/<%= remote_id %>/embed',
-						html: "<iframe style='width: 100%; height: 30rem; border: 1px solid #D3D3D3; border-radius: 12px;' frameborder='0' allowfullscreen='true'></iframe>",
+						html: "<iframe style='width: 100%; height: 30rem; border: 1px solid #D3D3D3; border-radius: 12px; margin: 1rem 0' frameborder='0' allowfullscreen='true'></iframe>",
 					},
 					drive: {
 						regex: /https:\/\/drive\.google\.com\/file\/d\/([A-Za-z0-9_-]+)\/view(\?.+)?/,
@@ -260,7 +260,7 @@ export function getEditorTools() {
 						regex: /https:\/\/docs\.google\.com\/presentation\/d\/([A-Za-z0-9_-]+)\/edit(\?.+)?/,
 						embedUrl:
 							'https://docs.google.com/presentation/d/<%= remote_id %>/embed',
-						html: "<iframe style='width: 100%; height: 30rem; border: 1px solid #D3D3D3; border-radius: 12px;' frameborder='0' allowfullscreen='true'></iframe>",
+						html: "<iframe style='width: 100%; height: 30rem; border: 1px solid #D3D3D3; border-radius: 12px; margin: 1rem 0;' frameborder='0' allowfullscreen='true'></iframe>",
 					},
 					codesandbox: {
 						regex: /^https:\/\/codesandbox\.io\/(?:embed\/)?([A-Za-z0-9_-]+)(?:\?[^\/]*)?$/,