diff --git a/frontend/src/pages/BatchCreation.vue b/frontend/src/pages/BatchCreation.vue
index 9885e5d3..75c367ad 100644
--- a/frontend/src/pages/BatchCreation.vue
+++ b/frontend/src/pages/BatchCreation.vue
@@ -199,9 +199,8 @@ import {
 } from 'frappe-ui'
 import Link from '@/components/Controls/Link.vue'
 import { useRouter } from 'vue-router'
-import { getFileSize } from '../utils'
+import { getFileSize, showToast } from '../utils'
 import { X, FileText } from 'lucide-vue-next'
-import { showToast } from '../utils'
 
 const router = useRouter()
 const user = inject('$user')
diff --git a/frontend/src/pages/JobCreation.vue b/frontend/src/pages/JobCreation.vue
index bf48e9b4..1ce01d1e 100644
--- a/frontend/src/pages/JobCreation.vue
+++ b/frontend/src/pages/JobCreation.vue
@@ -1,2 +1,310 @@
-<template></template>
-<script setup></script>
+<template>
+	<div class="h-screen text-base">
+		<header
+			class="sticky top-0 z-10 flex items-center justify-between border-b bg-white px-3 py-2.5 sm:px-5"
+		>
+			<Breadcrumbs :items="breadcrumbs" />
+			<Button variant="solid" @click="saveJob()">
+				{{ __('Save') }}
+			</Button>
+		</header>
+		<div class="py-5">
+			<div class="container border-b mb-4 pb-4">
+				<div class="text-lg font-semibold mb-4">
+					{{ __('Job Details') }}
+				</div>
+				<div class="grid grid-cols-2 gap-4">
+					<div>
+						<FormControl
+							v-model="job.job_title"
+							:label="__('Title')"
+							class="mb-4"
+						/>
+						<FormControl v-model="job.location" :label="__('Location')" />
+					</div>
+					<div>
+						<FormControl
+							v-model="job.type"
+							:label="__('Type')"
+							type="select"
+							:options="jobTypes"
+							class="mb-4"
+						/>
+						<FormControl
+							v-model="job.status"
+							:label="__('Status')"
+							type="select"
+							:options="jobStatuses"
+						/>
+					</div>
+				</div>
+				<div class="mt-4">
+					<label class="block text-gray-600 text-xs mb-1">
+						{{ __('Description') }}
+					</label>
+					<TextEditor
+						:content="job.description"
+						@change="(val) => (job.description = val)"
+						:editable="true"
+						:fixedMenu="true"
+						editorClass="prose-sm max-w-none border-b border-x bg-gray-100 rounded-b-md py-1 px-2 min-h-[7rem] mb-4"
+					/>
+				</div>
+			</div>
+			<div class="container mb-4 pb-4">
+				<div class="text-lg font-semibold mb-4">
+					{{ __('Company Details') }}
+				</div>
+				<div class="grid grid-cols-2 gap-4">
+					<div>
+						<FormControl
+							v-model="job.company_name"
+							:label="__('Company Name')"
+							class="mb-4"
+						/>
+						<FormControl
+							v-model="job.company_website"
+							:label="__('Company Website')"
+						/>
+					</div>
+					<div>
+						<FormControl
+							v-model="job.company_email_address"
+							:label="__('Company Email Address')"
+							class="mb-4"
+						/>
+						<label class="block text-gray-600 text-xs mb-1 mt-4">
+							{{ __('Company Logo') }}
+						</label>
+						<FileUploader
+							v-if="!job.image"
+							:fileTypes="['image/*']"
+							:validateFile="validateFile"
+							@success="(file) => saveImage(file)"
+						>
+							<template
+								v-slot="{ file, progress, uploading, openFileSelector }"
+							>
+								<div class="mb-4">
+									<Button @click="openFileSelector" :loading="uploading">
+										{{
+											uploading ? `Uploading ${progress}%` : 'Upload an image'
+										}}
+									</Button>
+								</div>
+							</template>
+						</FileUploader>
+						<div v-else class="">
+							<div class="flex items-center">
+								<div class="border rounded-md p-2 mr-2">
+									<FileText class="h-5 w-5 stroke-1.5 text-gray-700" />
+								</div>
+								<div class="flex flex-col">
+									<span>
+										{{ job.image.file_name }}
+									</span>
+									<span class="text-sm text-gray-500 mt-1">
+										{{ getFileSize(job.image.file_size) }}
+									</span>
+								</div>
+								<X
+									@click="removeImage()"
+									class="bg-gray-200 rounded-md cursor-pointer stroke-1.5 w-5 h-5 p-1 ml-4"
+								/>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</template>
+<script setup>
+import {
+	Breadcrumbs,
+	FormControl,
+	createResource,
+	Button,
+	TextEditor,
+	FileUploader,
+} from 'frappe-ui'
+import { computed, onMounted, reactive, inject } from 'vue'
+import { FileText, X } from 'lucide-vue-next'
+import { useRouter } from 'vue-router'
+import { getFileSize, showToast } from '../utils'
+
+const user = inject('$user')
+const router = useRouter()
+
+const props = defineProps({
+	jobName: {
+		type: String,
+		default: 'new',
+	},
+})
+
+const newJob = createResource({
+	url: 'frappe.client.insert',
+	makeParams(values) {
+		return {
+			doc: {
+				doctype: 'Job Opportunity',
+				company_logo: job.image.file_url,
+				...job,
+			},
+		}
+	},
+})
+
+const updateJob = createResource({
+	url: 'frappe.client.set_value',
+	makeParams(values) {
+		return {
+			doctype: 'Job Opportunity',
+			name: props.jobName,
+			fieldname: {
+				company_logo: job.image.file_url,
+				...job,
+			},
+		}
+	},
+})
+
+const jobDetail = createResource({
+	url: 'frappe.client.get',
+	makeParams(values) {
+		return {
+			doctype: 'Job Opportunity',
+			name: props.jobName,
+		}
+	},
+	onSuccess(data) {
+		Object.keys(data).forEach((key) => {
+			if (Object.hasOwn(job, key)) job[key] = data[key]
+		})
+		if (data.company_logo) imageResource.reload({ image: data.company_logo })
+	},
+})
+
+const imageResource = createResource({
+	url: 'lms.lms.api.get_file_info',
+	makeParams(values) {
+		return {
+			file_url: values.image,
+		}
+	},
+	auto: false,
+	onSuccess(data) {
+		job.image = data
+	},
+})
+
+const job = reactive({
+	job_title: '',
+	location: '',
+	type: 'Full Time',
+	status: 'Open',
+	company_name: '',
+	company_website: '',
+	image: null,
+	description: '',
+	company_email_address: '',
+})
+
+onMounted(() => {
+	if (!user.data) window.location.href = '/login'
+
+	if (props.jobName != 'new') jobDetail.reload()
+})
+
+const saveJob = () => {
+	if (jobDetail.data) {
+		editJobDetails()
+	} else {
+		createNewJob()
+	}
+}
+
+const createNewJob = () => {
+	newJob.submit(
+		{},
+		{
+			onSuccess(data) {
+				router.push({
+					name: 'JobDetail',
+					params: {
+						job: data.name,
+					},
+				})
+			},
+			onError(err) {
+				showToast('Error', err.messages?.[0] || err, 'x')
+			},
+		}
+	)
+}
+
+const editJobDetails = () => {
+	updateJob.submit(
+		{},
+		{
+			onSuccess(data) {
+				router.push({
+					name: 'JobDetail',
+					params: {
+						job: data.name,
+					},
+				})
+			},
+			onError(err) {
+				showToast('Error', err.messages?.[0] || err, 'x')
+			},
+		}
+	)
+}
+
+const saveImage = (file) => {
+	job.image = file
+}
+
+const removeImage = () => {
+	job.image = null
+}
+
+const validateFile = (file) => {
+	let extension = file.name.split('.').pop().toLowerCase()
+	if (!['jpg', 'jpeg', 'png'].includes(extension)) {
+		return 'Only image file is allowed.'
+	}
+}
+
+const jobTypes = computed(() => {
+	return [
+		{ label: 'Full Time', value: 'Full Time' },
+		{ label: 'Part Time', value: 'Part Time' },
+		{ label: 'Contract', value: 'Contract' },
+		{ label: 'Freelance', value: 'Freelance' },
+	]
+})
+
+const jobStatuses = computed(() => {
+	return [
+		{ label: 'Open', value: 'Open' },
+		{ label: 'Closed', value: 'Closed' },
+	]
+})
+
+const breadcrumbs = computed(() => {
+	let crumbs = [
+		{
+			label: 'Jobs',
+			route: { name: 'Jobs' },
+		},
+		{
+			label: props.jobName == 'new' ? 'New Job' : 'Edit Job',
+			route: { name: 'JobCreation' },
+		},
+	]
+	return crumbs
+})
+</script>
diff --git a/frontend/src/pages/JobDetail.vue b/frontend/src/pages/JobDetail.vue
index b88c30df..7d7806ef 100644
--- a/frontend/src/pages/JobDetail.vue
+++ b/frontend/src/pages/JobDetail.vue
@@ -17,12 +17,20 @@
 				]"
 			/>
 			<div v-if="user.data?.name" class="flex">
-				<Button class="mr-2">
-					<template #prefix>
-						<Flag class="h-4 w-4" />
-					</template>
-					{{ __('Report') }}
-				</Button>
+				<router-link
+					v-if="user.data.name == job.data?.owner"
+					:to="{
+						name: 'JobCreation',
+						params: { jobName: job.data?.name },
+					}"
+				>
+					<Button class="mr-2">
+						<template #prefix>
+							<Pencil class="h-4 w-4 stroke-1.5" />
+						</template>
+						{{ __('Edit') }}
+					</Button>
+				</router-link>
 				<Button
 					v-if="!jobApplication.data?.length"
 					variant="solid"
@@ -92,7 +100,7 @@
 <script setup>
 import { Badge, Button, Breadcrumbs, createResource } from 'frappe-ui'
 import { inject, ref, onMounted } from 'vue'
-import { MapPin, SendHorizonal, Flag } from 'lucide-vue-next'
+import { MapPin, SendHorizonal, Pencil } from 'lucide-vue-next'
 import JobApplicationModal from '@/components/Modals/JobApplicationModal.vue'
 
 const user = inject('$user')
diff --git a/frontend/src/pages/Jobs.vue b/frontend/src/pages/Jobs.vue
index 40d8abe8..9098b0a9 100644
--- a/frontend/src/pages/Jobs.vue
+++ b/frontend/src/pages/Jobs.vue
@@ -8,7 +8,15 @@
 				:items="[{ label: __('Jobs'), route: { name: 'Jobs' } }]"
 			/>
 			<div class="flex">
-				<router-link v-if="user.data?.name">
+				<router-link
+					v-if="user.data?.name"
+					:to="{
+						name: 'JobCreation',
+						params: {
+							jobName: 'new',
+						},
+					}"
+				>
 					<Button variant="solid">
 						<template #prefix>
 							<Plus class="h-4 w-4" />
diff --git a/frontend/src/pages/Lesson.vue b/frontend/src/pages/Lesson.vue
index ec2d5ac7..8034f8ce 100644
--- a/frontend/src/pages/Lesson.vue
+++ b/frontend/src/pages/Lesson.vue
@@ -126,7 +126,7 @@
 					v-else-if="lesson.data.instructor_notes"
 					class="ProseMirror prose prose-table:table-fixed prose-td:p-2 prose-th:p-2 prose-td:border prose-th:border prose-td:border-gray-300 prose-th:border-gray-300 prose-td:relative prose-th:relative prose-th:bg-gray-100 prose-sm max-w-none !whitespace-normal mt-6"
 				>
-					<LessonContent :data="lesson.data.instructor_notes" />
+					<LessonContent :content="lesson.data.instructor_notes" />
 				</div>
 				<div
 					v-if="lesson.data.content"
diff --git a/frontend/src/router.js b/frontend/src/router.js
index af47e3f8..d12883fe 100644
--- a/frontend/src/router.js
+++ b/frontend/src/router.js
@@ -89,7 +89,7 @@ const routes = [
 		props: true,
 	},
 	{
-		path: '/batches/:batchName/edit',
+		path: '/job-opening/:jobName/edit',
 		name: 'JobCreation',
 		component: () => import('@/pages/JobCreation.vue'),
 		props: true,
diff --git a/frontend/src/utils/index.js b/frontend/src/utils/index.js
index da004ff7..6a8ed735 100644
--- a/frontend/src/utils/index.js
+++ b/frontend/src/utils/index.js
@@ -73,7 +73,7 @@ export function getFileSize(file_size) {
 export function showToast(title, text, icon) {
 	createToast({
 		title: title,
-		text: text,
+		text: htmlToText(text),
 		icon: icon,
 		iconClasses:
 			icon == 'check'
@@ -84,6 +84,12 @@ export function showToast(title, text, icon) {
 	})
 }
 
+export function htmlToText(html) {
+	const div = document.createElement('div')
+	div.innerHTML = html
+	return div.textContent || div.innerText || ''
+}
+
 export function getEditorTools() {
 	return {
 		header: Header,
diff --git a/lms/lms/api.py b/lms/lms/api.py
index 44198aaa..64c3b4af 100644
--- a/lms/lms/api.py
+++ b/lms/lms/api.py
@@ -235,6 +235,7 @@ def get_job_details(job):
 			"name",
 			"creation",
 			"description",
+			"owner",
 		],
 		as_dict=1,
 	)