diff --git a/frontend/src/components/AppSidebar.vue b/frontend/src/components/AppSidebar.vue
index 1379bc7f..c3d9c173 100644
--- a/frontend/src/components/AppSidebar.vue
+++ b/frontend/src/components/AppSidebar.vue
@@ -352,7 +352,7 @@ const addProgrammingExercises = () => {
 			activeFor: [
 				'ProgrammingExercises',
 				'ProgrammingExerciseForm',
-				'ProgrammingExerciseSubmissionList',
+				'ProgrammingExerciseSubmissions',
 				'ProgrammingExerciseSubmission',
 			],
 		})
diff --git a/frontend/src/components/Assessments.vue b/frontend/src/components/Assessments.vue
index e6377e3a..94db559a 100644
--- a/frontend/src/components/Assessments.vue
+++ b/frontend/src/components/Assessments.vue
@@ -40,7 +40,7 @@
 						<template #default="{ column, item }">
 							<ListRowItem :item="row[column.key]" :align="column.align">
 								<div v-if="column.key == 'assessment_type'">
-									{{ row[column.key] == 'LMS Quiz' ? 'Quiz' : 'Assignment' }}
+									{{ getAssessmentTypeLabel(row[column.key]) }}
 								</div>
 								<div v-else-if="column.key == 'title'">
 									{{ row[column.key] }}
@@ -172,6 +172,24 @@ const getRowRoute = (row) => {
 				},
 			}
 		}
+	} else if (row.assessment_type == 'LMS Programming Exercise') {
+		if (row.submission) {
+			return {
+				name: 'ProgrammingExerciseSubmission',
+				params: {
+					exerciseID: row.assessment_name,
+					submissionID: row.submission.name,
+				},
+			}
+		} else {
+			return {
+				name: 'ProgrammingExerciseSubmission',
+				params: {
+					exerciseID: row.assessment_name,
+					submissionID: 'new',
+				},
+			}
+		}
 	} else {
 		return {
 			name: 'QuizPage',
@@ -221,4 +239,14 @@ const getStatusTheme = (status) => {
 		return 'red'
 	}
 }
+
+const getAssessmentTypeLabel = (type) => {
+	if (type == 'LMS Assignment') {
+		return __('Assignment')
+	} else if (type == 'LMS Quiz') {
+		return __('Quiz')
+	} else if (type == 'LMS Programming Exercise') {
+		return __('Programming Exercise')
+	}
+}
 </script>
diff --git a/frontend/src/components/Controls/ChildTable.vue b/frontend/src/components/Controls/ChildTable.vue
index 0037fc92..54c471b0 100644
--- a/frontend/src/components/Controls/ChildTable.vue
+++ b/frontend/src/components/Controls/ChildTable.vue
@@ -1,7 +1,6 @@
 <template>
 	<div>
 		<div class="overflow-x-auto border rounded-md">
-			<!-- Header Row -->
 			<div
 				class="grid items-center space-x-4 p-2 border-b"
 				:style="{ gridTemplateColumns: getGridTemplateColumns() }"
@@ -15,7 +14,7 @@
 				</div>
 				<div></div>
 			</div>
-			<!-- Data Rows -->
+
 			<div
 				v-for="(row, rowIndex) in rows"
 				:key="rowIndex"
@@ -31,18 +30,20 @@
 				</template>
 
 				<div class="relative" ref="menuRef">
-					<Button variant="ghost">
+					<Button
+						variant="ghost"
+						@click="(event: MouseEvent) => toggleMenu(rowIndex, event)"
+					>
 						<template #icon>
 							<Ellipsis
 								class="size-4 text-ink-gray-7 stroke-1.5 cursor-pointer"
-								@click="toggleMenu(rowIndex)"
 							/>
 						</template>
 					</Button>
 
 					<div
 						v-if="menuOpenIndex === rowIndex"
-						class="absolute right-0 z-10 mt-1 w-32 bg-white border border-outline-gray-1 rounded-md shadow-sm"
+						class="absolute right-[30px] top-5 mt-1 w-32 bg-surface-white border border-outline-gray-1 rounded-md shadow-sm"
 					>
 						<button
 							@click="deleteRow(rowIndex)"
@@ -58,7 +59,6 @@
 			</div>
 		</div>
 
-		<!-- Add Row Button -->
 		<div class="mt-2">
 			<Button @click="addRow">
 				<template #prefix>
@@ -77,7 +77,9 @@ import { Ellipsis, Plus, Trash2 } from 'lucide-vue-next'
 import { onClickOutside } from '@vueuse/core'
 
 const rows = defineModel<Cell[][]>()
+const menuRef = ref(null)
 const menuOpenIndex = ref<number | null>(null)
+const menuTopPosition = ref<string>('')
 const emit = defineEmits<{
 	(e: 'update:modelValue', value: Cell[][]): void
 }>()
@@ -87,7 +89,6 @@ type Cell = {
 	editable?: boolean
 }
 
-// Props
 const props = withDefaults(
 	defineProps<{
 		modelValue?: Cell[][]
@@ -121,12 +122,11 @@ const getGridTemplateColumns = () => {
 	return [...Array(columns.value.length).fill('1fr'), '0.25fr'].join(' ')
 }
 
-const toggleMenu = (index: number) => {
+const toggleMenu = (index: number, event: MouseEvent) => {
 	menuOpenIndex.value = menuOpenIndex.value === index ? null : index
+	menuTopPosition.value = `${event.clientY + 10}px`
 }
 
-// Optional: Close menu when clicking outside
-const menuRef = ref(null)
 onClickOutside(menuRef, () => {
 	menuOpenIndex.value = null
 })
diff --git a/frontend/src/components/Modals/AssessmentModal.vue b/frontend/src/components/Modals/AssessmentModal.vue
index b0a64d69..46779a47 100644
--- a/frontend/src/components/Modals/AssessmentModal.vue
+++ b/frontend/src/components/Modals/AssessmentModal.vue
@@ -99,6 +99,7 @@ const assessmentTypes = computed(() => {
 	return [
 		{ label: 'Quiz', value: 'LMS Quiz' },
 		{ label: 'Assignment', value: 'LMS Assignment' },
+		{ label: 'Programming Exercise', value: 'LMS Programming Exercise' },
 	]
 })
 </script>
diff --git a/frontend/src/pages/ProgrammingExercises/ProgrammingExerciseForm.vue b/frontend/src/pages/ProgrammingExercises/ProgrammingExerciseForm.vue
index 25e29514..f9ee5ca9 100644
--- a/frontend/src/pages/ProgrammingExercises/ProgrammingExerciseForm.vue
+++ b/frontend/src/pages/ProgrammingExercises/ProgrammingExerciseForm.vue
@@ -1,5 +1,5 @@
 <template>
-	<Dialog v-model="show" :options="{ size: '2xl' }">
+	<Dialog v-model="show" :options="{ size: '5xl' }">
 		<template #body-title>
 			<div class="text-xl font-semibold text-ink-gray-9">
 				{{
@@ -10,41 +10,45 @@
 			</div>
 		</template>
 		<template #body-content>
-			<div class="space-y-4">
-				<FormControl
-					v-model="exercise.title"
-					:label="__('Title')"
-					:required="true"
-				/>
-				<FormControl
-					v-model="exercise.language"
-					:label="__('Language')"
-					type="select"
-					:options="languageOptions"
-					:required="true"
-				/>
-				<div>
-					<div class="text-xs text-ink-gray-5 mb-2">
-						{{ __('Problem Statement') }}
-						<span class="text-ink-red-3">*</span>
-					</div>
-					<TextEditor
-						:content="exercise.problem_statement"
-						@change="(val: string) => (exercise.problem_statement = val)"
+			<div class="grid grid-cols-2 gap-10">
+				<div class="space-y-4">
+					<FormControl
+						v-model="exercise.title"
+						:label="__('Title')"
+						:required="true"
+					/>
+					<FormControl
+						v-model="exercise.language"
+						:label="__('Language')"
+						type="select"
+						:options="languageOptions"
+						:required="true"
+					/>
+					<ChildTable
+						v-model="exercise.test_cases"
+						:columns="testCaseColumns"
+						:required="true"
+						:addable="true"
+						:deletable="true"
 						:editable="true"
-						:fixedMenu="true"
-						editorClass="prose-sm max-w-none border-b border-x bg-surface-gray-2 rounded-b-md py-1 px-2 min-h-[7rem] max-h-[18rem] overflow-y-auto"
+						:placeholder="__('Add Test Case')"
 					/>
 				</div>
-				<ChildTable
-					v-model="exercise.test_cases"
-					:columns="testCaseColumns"
-					:required="true"
-					:addable="true"
-					:deletable="true"
-					:editable="true"
-					:placeholder="__('Add Test Case')"
-				/>
+				<div>
+					<div>
+						<div class="text-xs text-ink-gray-5 mb-2">
+							{{ __('Problem Statement') }}
+							<span class="text-ink-red-3">*</span>
+						</div>
+						<TextEditor
+							:content="exercise.problem_statement"
+							@change="(val: string) => (exercise.problem_statement = val)"
+							:editable="true"
+							:fixedMenu="true"
+							editorClass="prose-sm max-w-none border-b border-x bg-surface-gray-2 rounded-b-md py-1 px-2 min-h-[7rem] max-h-[21rem] overflow-y-auto"
+						/>
+					</div>
+				</div>
 			</div>
 		</template>
 		<template #actions="{ close }">
@@ -65,7 +69,9 @@
 				<router-link
 					:to="{
 						name: 'ProgrammingExerciseSubmissions',
-						params: { exerciseID: props.exerciseID },
+						query: {
+							exercise: props.exerciseID,
+						},
 					}"
 				>
 					<Button>
@@ -105,12 +111,14 @@ const exercises = defineModel<{
 		) => void
 	}
 }>('exercises')
+
 const exercise = ref<ProgrammingExercise>({
 	title: '',
 	language: 'Python',
 	problem_statement: '',
 	test_cases: [],
 })
+
 const languageOptions = [
 	{ label: 'Python', value: 'Python' },
 	{ label: 'JavaScript', value: 'JavaScript' },
@@ -159,6 +167,8 @@ const fetchTestCases = () => {
 	testCases.update({
 		filters: {
 			parent: props.exerciseID,
+			parenttype: 'LMS Programming Exercise',
+			parentfield: 'test_cases',
 		},
 	})
 	testCases.reload()
diff --git a/frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmission.vue b/frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmission.vue
index 2d2bb3f4..d9ea9bcd 100644
--- a/frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmission.vue
+++ b/frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmission.vue
@@ -11,7 +11,7 @@
 			class="ProseMirror prose prose-table:table-fixed prose-td:p-2 prose-th:p-2 prose-td:border prose-th:border prose-td:border-outline-gray-2 prose-th:border-outline-gray-2 prose-td:relative prose-th:relative prose-th:bg-surface-gray-2 prose-sm max-w-none !whitespace-normal border-r px-5 py-2 h-full"
 		></div>
 		<div>
-			<div class="flex items-center justify-between p-2 bg-surface-gray-1">
+			<div class="flex items-center justify-between p-2 bg-surface-gray-2">
 				<div class="font-semibold">
 					{{ exercise.doc?.language }}
 				</div>
@@ -38,7 +38,7 @@
 					maxHeight="1000px"
 				/>
 				<span v-if="error" class="text-xs text-ink-gray-5 px-2">
-					{{ __('Compiler Error') }}:
+					{{ __('Compiler Message') }}:
 				</span>
 				<textarea
 					v-if="error"
@@ -48,6 +48,7 @@
 				/>
 				<!-- <textarea v-else v-model="output" class="bg-surface-gray-1 border-none text-sm h-28 leading-6" readonly /> -->
 			</div>
+
 			<div ref="testCaseSection" v-if="testCases.length" class="p-3">
 				<span class="text-lg font-semibold text-ink-gray-9">
 					{{ __('Test Cases') }}
@@ -132,7 +133,7 @@ const testCases = ref<
 	}>
 >([])
 const boilerplate = ref<string>(
-	`with open("stdin", "r") as f:\n    data = f.read()\n\ninputs = data.split()\n\n# inputs is a list of strings\n# write your code below\n\n`
+	`with open("stdin", "r") as f:\n    data = f.read()\n\ninputs = data.split() if len(data) else []\n\n# inputs is a list of strings\n# write your code below\n\n`
 )
 const { brand } = sessionStore()
 const router = useRouter()
@@ -179,7 +180,9 @@ watch(
 	(doc) => {
 		if (doc) {
 			code.value = `${boilerplate.value}${doc.code || ''}\n`
-			testCases.value = doc.test_cases || []
+			if (testCases.value.length === 0) {
+				testCases.value = doc.test_cases || []
+			}
 		}
 	},
 	{ immediate: true }
@@ -207,6 +210,7 @@ const runCode = async () => {
 	if (testCaseSection.value) {
 		testCaseSection.value.scrollIntoView({ behavior: 'smooth' })
 	}
+
 	for (const test_case of exercise.doc.test_cases) {
 		let result = await execute(test_case.input)
 		if (error.value) {
@@ -217,7 +221,6 @@ const runCode = async () => {
 		}
 		let status =
 			result.trim() === test_case.expected_output.trim() ? 'Passed' : 'Failed'
-
 		testCases.value.push({
 			input: test_case.input,
 			output: result,
@@ -256,41 +259,57 @@ const createSubmission = () => {
 		})
 }
 
-const execute = async (stdin = '') => {
-	return new Promise<string>((resolve, reject) => {
+const execute = (stdin = ''): Promise<string> => {
+	return new Promise((resolve, reject) => {
 		let outputChunks: string[] = []
+		let hasExited = false
+		let hasError = false
 
-		const session = new LiveCodeSession({
+		let session = new LiveCodeSession({
 			base_url: 'https://falcon.frappe.io',
 			runtime: 'python',
 			code: code.value,
 			files: [{ filename: 'stdin', contents: stdin }],
 			onMessage: (msg: any) => {
+				console.log('msg', msg)
+
 				if (msg.msgtype === 'write' && msg.file === 'stdout') {
 					outputChunks.push(msg.data)
 				}
 
-				if (msg.msgtype == 'exitstatus') {
-					if (msg.exitstatus != 0) {
+				if (msg.msgtype === 'write' && msg.file === 'stderr') {
+					hasError = true
+					errorMessage.value = msg.data
+				}
+
+				if (msg.msgtype === 'exitstatus') {
+					hasExited = true
+					if (msg.exitstatus !== 0) {
 						error.value = true
 					} else {
 						error.value = false
 					}
-				}
-
-				if (msg.msgtype === 'exitstatus') {
-					resolve(outputChunks.join(''))
+					resolve(outputChunks.join('').trim())
 				}
 			},
 		})
 
-		setTimeout(() => reject('Execution timed out.'), 10000)
+		setTimeout(() => {
+			if (!hasExited) {
+				error.value = true
+				errorMessage.value = 'Execution timed out.'
+				reject('Execution timed out.')
+			}
+		}, 20000)
 	})
 }
 
 const breadcrumbs = computed(() => {
 	return [
-		{ label: __('Programming Exercises') },
+		{
+			label: __('Programming Exercise Submissions'),
+			route: { name: 'ProgrammingExerciseSubmissions' },
+		},
 		{ label: exercise.doc?.title },
 	]
 })
diff --git a/frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmissions.vue b/frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmissions.vue
index 87756763..4cf40e4b 100644
--- a/frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmissions.vue
+++ b/frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmissions.vue
@@ -129,18 +129,20 @@ import {
 	ListRowItem,
 	usePageMeta,
 } from 'frappe-ui'
-import { computed, inject, ref, watch } from 'vue'
-import { sessionStore } from '@/stores/session'
 import type {
 	ProgrammingExerciseSubmission,
 	Filters,
 } from '@/pages/ProgrammingExercises/types'
+import { computed, inject, onMounted, ref, watch } from 'vue'
+import { sessionStore } from '@/stores/session'
 import { useRouter } from 'vue-router'
 import Link from '@/components/Controls/Link.vue'
 import EmptyState from '@/components/EmptyState.vue'
 
 const { brand } = sessionStore()
 const dayjs = inject('$dayjs') as any
+const user = inject('$user') as any
+const filterFields = ['exercise', 'member', 'status']
 const filters = ref<Filters>({
 	exercise: '',
 	member: '',
@@ -148,6 +150,19 @@ const filters = ref<Filters>({
 })
 const router = useRouter()
 
+onMounted(() => {
+	if (!user.data?.is_instructor && !user.data?.is_moderator) {
+		router.push({ name: 'Courses' })
+	}
+	filterFields.forEach((field) => {
+		if (router.currentRoute.value.query[field]) {
+			filters.value[field as keyof Filters] = router.currentRoute.value.query[
+				field
+			] as string
+		}
+	})
+})
+
 const submissions = createListResource({
 	doctype: 'LMS Programming Exercise Submission',
 	fields: [
@@ -172,7 +187,6 @@ const submissions = createListResource({
 
 watch(filters.value, () => {
 	let filtersToApply: Record<string, any> = {}
-	const filterFields = ['exercise', 'member', 'status']
 	filterFields.forEach((field) => {
 		if (filters.value[field as keyof Filters]) {
 			filtersToApply[field] = filters.value[field as keyof Filters]
@@ -211,7 +225,7 @@ const submissionColumns = computed(() => {
 		{
 			label: __('Exercise'),
 			key: 'exercise_title',
-			width: '40%',
+			width: '30%',
 			icon: 'code',
 		},
 		{
@@ -225,6 +239,7 @@ const submissionColumns = computed(() => {
 			key: 'modified',
 			width: '20%',
 			icon: 'clock',
+			align: 'right',
 		},
 	]
 })
diff --git a/frontend/src/pages/ProgrammingExercises/ProgrammingExercises.vue b/frontend/src/pages/ProgrammingExercises/ProgrammingExercises.vue
index 8bfea1fe..0a994b06 100644
--- a/frontend/src/pages/ProgrammingExercises/ProgrammingExercises.vue
+++ b/frontend/src/pages/ProgrammingExercises/ProgrammingExercises.vue
@@ -54,7 +54,7 @@
 						showForm = true
 					}
 				"
-				class="flex flex-col border rounded-md p-3 h-full hover:border-outline-gray-3 space-y-2"
+				class="flex flex-col border rounded-md p-3 h-full hover:border-outline-gray-3 space-y-2 cursor-pointer"
 			>
 				<div class="text-lg font-semibold text-ink-gray-9">
 					{{ exercise.title }}
diff --git a/frontend/src/router.js b/frontend/src/router.js
index 477c03a9..c9db6b26 100644
--- a/frontend/src/router.js
+++ b/frontend/src/router.js
@@ -216,20 +216,13 @@ const routes = [
 		component: () => import('@/pages/PersonaForm.vue'),
 	},
 	{
-		path: '/exercises',
+		path: '/programming-exercises',
 		name: 'ProgrammingExercises',
 		component: () =>
 			import('@/pages/ProgrammingExercises/ProgrammingExercises.vue'),
 	},
 	{
-		path: '/exercises/:exerciseID',
-		name: 'ProgrammingExerciseForm',
-		component: () =>
-			import('@/pages/ProgrammingExercises/ProgrammingExerciseForm.vue'),
-		props: true,
-	},
-	{
-		path: '/exercises/submissions',
+		path: '/programming-exercises/submissions',
 		name: 'ProgrammingExerciseSubmissions',
 		component: () =>
 			import(
@@ -238,7 +231,7 @@ const routes = [
 		props: true,
 	},
 	{
-		path: '/exercises/:exerciseID/submission/:submissionID',
+		path: '/programming-exercises/:exerciseID/submission/:submissionID',
 		name: 'ProgrammingExerciseSubmission',
 		component: () =>
 			import(
diff --git a/lms/lms/api.py b/lms/lms/api.py
index 3a09567a..b6bf33f7 100644
--- a/lms/lms/api.py
+++ b/lms/lms/api.py
@@ -1544,24 +1544,18 @@ def get_exercise_status(test_cases):
 
 
 def update_test_cases(test_cases, submission):
+	frappe.db.delete("LMS Test Case Submission", {"parent": submission})
 	for row in test_cases:
-		test_case = frappe.db.get_value(
-			"LMS Test Case Submission",
+		test_case = frappe.new_doc("LMS Test Case Submission")
+		test_case.update(
 			{
 				"parent": submission,
+				"parenttype": "LMS Programming Exercise Submission",
+				"parentfield": "test_cases",
 				"input": row.get("input"),
-			},
-			"name",
-			as_dict=True,
+				"output": row.get("output"),
+				"expected_output": row.get("expected_output"),
+				"status": row.get("status", "Failed"),
+			}
 		)
-
-		if test_case:
-			frappe.db.set_value(
-				"LMS Test Case Submission",
-				test_case.name,
-				{
-					"output": row.get("output"),
-					"expected_output": row.get("expected_output"),
-					"status": row.get("status", "Failed"),
-				},
-			)
+		test_case.insert()
diff --git a/lms/lms/doctype/lms_test_case_submission/lms_test_case_submission.json b/lms/lms/doctype/lms_test_case_submission/lms_test_case_submission.json
index 00a22028..2c533d71 100644
--- a/lms/lms/doctype/lms_test_case_submission/lms_test_case_submission.json
+++ b/lms/lms/doctype/lms_test_case_submission/lms_test_case_submission.json
@@ -16,6 +16,7 @@
   {
    "fieldname": "input",
    "fieldtype": "Data",
+   "in_list_view": 1,
    "label": "Input"
   },
   {
@@ -49,8 +50,8 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2025-06-18 20:06:57.182153",
- "modified_by": "Administrator",
+ "modified": "2025-06-24 11:23:13.803159",
+ "modified_by": "sayali@frappe.io",
  "module": "LMS",
  "name": "LMS Test Case Submission",
  "owner": "Administrator",
diff --git a/lms/lms/utils.py b/lms/lms/utils.py
index dffb8d52..7b9f491f 100644
--- a/lms/lms/utils.py
+++ b/lms/lms/utils.py
@@ -1504,6 +1504,9 @@ def get_assessments(batch, member=None):
 		elif assessment.assessment_type == "LMS Quiz":
 			assessment = get_quiz_details(assessment, member)
 
+		elif assessment.assessment_type == "LMS Programming Exercise":
+			assessment = get_exercise_details(assessment, member)
+
 	return assessments
 
 
@@ -1576,6 +1579,31 @@ def get_quiz_details(assessment, member):
 	return assessment
 
 
+def get_exercise_details(assessment, member):
+	assessment.title = frappe.db.get_value(
+		"LMS Programming Exercise", assessment.assessment_name, "title"
+	)
+	filters = {"member": member, "exercise": assessment.assessment_name}
+
+	if frappe.db.exists("LMS Programming Exercise Submission", filters):
+		assessment.submission = frappe.db.get_value(
+			"LMS Programming Exercise Submission",
+			filters,
+			["name", "status"],
+			as_dict=True,
+		)
+		assessment.completed = True
+		assessment.status = assessment.submission.status
+		assessment.edit_url = (
+			f"/exercises/{assessment.assessment_name}/submission/{assessment.submission.name}"
+		)
+	else:
+		assessment.status = "Not Attempted"
+		assessment.color = "red"
+		assessment.completed = False
+		assessment.edit_url = f"/exercises/{assessment.assessment_name}/submission/new"
+
+
 @frappe.whitelist()
 def get_batch_students(batch):
 	students = []