diff --git a/.github/helper/install.sh b/.github/helper/install.sh
index 75cf4854..21bb9d9a 100644
--- a/.github/helper/install.sh
+++ b/.github/helper/install.sh
@@ -12,7 +12,6 @@ bench -v setup requirements
 
 echo "Setting Up LMS App..."
 bench get-app lms "${GITHUB_WORKSPACE}"
-bench get-app payments "${GITHUB_WORKSPACE}"
 
 echo "Setting Up Sites & Database..."
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ca016d65..bfe2b8b4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -65,9 +65,6 @@ jobs:
     - name: add lms app to bench
       working-directory: /home/runner/frappe-bench
       run: bench get-app lms $GITHUB_WORKSPACE
-    - name: add payments app to bench
-      working-directory: /home/runner/frappe-bench
-      run: bench get-app payments $GITHUB_WORKSPACE
     - name: create bench site
       working-directory: /home/runner/frappe-bench
       run: bench new-site --mariadb-root-password root --admin-password admin frappe.local
diff --git a/frontend/src/pages/Courses/CourseForm.vue b/frontend/src/pages/Courses/CourseForm.vue
index 0391fcab..3639bf40 100644
--- a/frontend/src/pages/Courses/CourseForm.vue
+++ b/frontend/src/pages/Courses/CourseForm.vue
@@ -1,7 +1,10 @@
 <template>
 	<div class="pl-5">
 		<div class="grid grid-cols-1 md:grid-cols-[70%,30%]">
-			<div v-if="courseResource.doc" class="lg:max-h-[88vh] lg:overflow-y-auto">
+			<div
+				v-if="courseResource.doc"
+				class="lg:max-h-[88vh] lg:overflow-y-auto px-1"
+			>
 				<div class="my-5">
 					<div class="pr-5 md:pr-10 pb-5 mb-5 space-y-5 border-b">
 						<div class="text-lg font-semibold mb-4 text-ink-gray-9">
diff --git a/frontend/src/pages/ProgrammingExercises/ProgrammingExerciseForm.vue b/frontend/src/pages/ProgrammingExercises/ProgrammingExerciseForm.vue
index d571bb6f..0b200681 100644
--- a/frontend/src/pages/ProgrammingExercises/ProgrammingExerciseForm.vue
+++ b/frontend/src/pages/ProgrammingExercises/ProgrammingExerciseForm.vue
@@ -71,6 +71,7 @@
 					{{ __('Delete') }}
 				</Button>
 				<router-link
+					v-if="exerciseID != 'new'"
 					:to="{
 						name: 'ProgrammingExerciseSubmission',
 						params: {
@@ -87,6 +88,7 @@
 					</Button>
 				</router-link>
 				<router-link
+					v-if="exerciseID != 'new'"
 					:to="{
 						name: 'ProgrammingExerciseSubmissions',
 						query: {
@@ -148,6 +150,7 @@ const languageOptions = [
 const props = withDefaults(
 	defineProps<{
 		exerciseID: string
+		getExerciseCount: () => Promise<number>
 	}>(),
 	{
 		exerciseID: 'new',
@@ -185,7 +188,6 @@ const setExerciseData = () => {
 const testCases = createListResource({
 	doctype: 'LMS Test Case',
 	fields: ['input', 'expected_output', 'name'],
-	cache: ['testCases', props.exerciseID],
 	parent: 'LMS Programming Exercise',
 	orderBy: 'idx',
 	onSuccess(data: TestCase[]) {
@@ -207,7 +209,7 @@ const fetchTestCases = () => {
 		},
 	})
 	testCases.reload()
-	originalTestCaseCount.value = testCases.data.length
+	originalTestCaseCount.value = testCases.data?.length
 }
 
 const validateTitle = () => {
@@ -223,7 +225,7 @@ watch(
 )
 
 watch(testCases, () => {
-	if (testCases.data.length !== originalTestCaseCount.value) {
+	if (testCases.data?.length !== originalTestCaseCount.value) {
 		isDirty.value = true
 	}
 })
@@ -255,6 +257,7 @@ const createNewExercise = (close: () => void) => {
 				close()
 				isDirty.value = false
 				exercises.value?.reload()
+				props.getExerciseCount()
 				toast.success(__('Programming Exercise created successfully'))
 			},
 			onError(err: any) {
diff --git a/frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmission.vue b/frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmission.vue
index 71f9563c..2c6fb81f 100644
--- a/frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmission.vue
+++ b/frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmission.vue
@@ -300,7 +300,7 @@ const loadFalcon = () => {
 	}
 	return new Promise((resolve, reject) => {
 		const script = document.createElement('script')
-		script.src = `${falconURL.value}static/livecode.js`
+		script.src = `${falconURL.value}/static/livecode.js`
 		script.onload = resolve
 		script.onerror = reject
 		document.head.appendChild(script)
diff --git a/frontend/src/pages/ProgrammingExercises/ProgrammingExercises.vue b/frontend/src/pages/ProgrammingExercises/ProgrammingExercises.vue
index e6908f80..7b78014f 100644
--- a/frontend/src/pages/ProgrammingExercises/ProgrammingExercises.vue
+++ b/frontend/src/pages/ProgrammingExercises/ProgrammingExercises.vue
@@ -5,6 +5,7 @@
 		<Breadcrumbs :items="breadcrumbs" />
 		<div class="space-x-2">
 			<router-link
+				v-if="exercises.data?.length"
 				:to="{
 					name: 'ProgrammingExerciseSubmissions',
 				}"
@@ -120,8 +121,9 @@
 	</div>
 	<ProgrammingExerciseForm
 		v-model="showForm"
-		:exerciseID="exerciseID"
 		v-model:exercises="exercises"
+		:exerciseID="exerciseID"
+		:getExerciseCount="getExerciseCount"
 	/>
 </template>
 <script setup lang="ts">
@@ -152,7 +154,7 @@ const exerciseCount = ref<number>(0)
 const readOnlyMode = window.read_only_mode
 const { brand } = sessionStore()
 const showForm = ref<boolean>(false)
-const exerciseID = ref<string | null>('new')
+const exerciseID = ref<string>('new')
 const user = inject<any>('$user')
 const titleFilter = ref<string>('')
 const languageFilter = ref<string>('')