diff --git a/frontend/src/components/Batch/BatchJobErrorResults.vue b/frontend/src/components/Batch/BatchJobErrorResults.vue
index e167ccbe..b220831e 100644
--- a/frontend/src/components/Batch/BatchJobErrorResults.vue
+++ b/frontend/src/components/Batch/BatchJobErrorResults.vue
@@ -1,24 +1,40 @@
 <template>
-  <v-card>
+  <v-card class="p-3">
+    <v-overlay
+      v-model="batchLoading"
+      class="align-center justify-center"
+      contained
+    >
+      <v-progress-circular
+        v-if="batchLoading"
+        indeterminate
+        color="primary"
+        size="64"
+      >
+        Loading...
+      </v-progress-circular>
+    </v-overlay>
     <div class="d-flex justify-space-between align-center">
       <v-card-title> Batch Job #{{ selectedErrorId }} Error(s) </v-card-title>
 
       <!-- Slot for close button -->
       <slot name="close"></slot>
     </div>
+
     <!-- No results message-->
-    <p v-if="rows < 1">
+    <p v-if="totalElements < 1 && !batchLoading">
       There are no results to display.<br />
       Please select another Job Execution ID.
     </p>
-    <v-data-table
+
+    <v-data-table-server
+      v-model:items-per-page="itemsPerPage"
       title="Job/Runs"
-      :items="batchData"
       :headers="batchDataFields"
-      id="id"
-      :showFilter="false"
-      :pagination="true"
-      class="p-3"
+      :items="batchData"
+      :items-length="totalElements"
+      item-value="id"
+      @update:options="loadItems"
     >
       <template v-slot:item.pen="{ item }">
         <v-btn
@@ -35,7 +51,7 @@
       <template v-slot:item.schoolOfRecord="{ item }">
         <div v-if="item.schoolOfRecord">{{ item.schoolOfRecord }}</div>
       </template>
-    </v-data-table>
+    </v-data-table-server>
   </v-card>
 </template>
 
@@ -58,9 +74,12 @@ export default {
       batchData: [],
       perPage: 10,
       rows: 0,
+      totalElements: 0,
+      itemsPerPage: 10,
       currentPage: 0,
       userSelectedPage: 0,
       batchLoading: false,
+
       batchDataFields: [
         {
           key: "pen",
@@ -96,10 +115,6 @@ export default {
 
   computed: {
     ...mapGetters("auth", ["token"]),
-
-    currentPageChange() {
-      return this.userSelectedPage;
-    },
   },
   created() {
     this.loadStudent = sharedMethods.loadStudent;
@@ -109,13 +124,22 @@ export default {
     selectedErrorId: function () {
       this.getAdminDashboardData(this.selectedErrorId, 0);
     },
-    currentPageChange: function () {
-      if (this.userSelectedPage !== null) {
-        this.getAdminDashboardData(this.selectedErrorId, this.userSelectedPage);
-      }
-    },
   },
   methods: {
+    loadItems({ page, itemsPerPage, sortBy }) {
+      this.batchLoading = true;
+      BatchProcessingService.getBatchErrors(this.selectedErrorId, page - 1)
+        .then((response) => {
+          this.batchData = response.data.errorList;
+          this.totalElements = response.data.totalElements;
+          this.batchLoading = false;
+        })
+        .catch((error) => {
+          if (error.response.status) {
+            this.batchLoading = false;
+          }
+        });
+    },
     getAdminDashboardData(batchId, page) {
       this.batchData = [];
       this.rows = 0;
diff --git a/frontend/src/components/Batch/BatchJobSearchResults.vue b/frontend/src/components/Batch/BatchJobSearchResults.vue
index a13c3914..b3954c17 100644
--- a/frontend/src/components/Batch/BatchJobSearchResults.vue
+++ b/frontend/src/components/Batch/BatchJobSearchResults.vue
@@ -1,22 +1,28 @@
 <template>
   <v-card class="p-3">
+    <v-overlay
+      v-model="batchLoading"
+      class="align-center justify-center"
+      contained
+    >
+      <v-progress-circular
+        v-if="batchLoading"
+        indeterminate
+        color="primary"
+        size="64"
+      >
+        Loading...
+      </v-progress-circular>
+    </v-overlay>
     <div class="d-flex justify-space-between align-center">
       <v-card-title> Batch Job #{{ selectedBatchId }} students </v-card-title>
 
       <!-- Slot for close button -->
       <slot name="close"></slot>
     </div>
-    <v-progress-circular
-      v-if="isLoading"
-      indeterminate
-      color="primary"
-      size="64"
-    >
-      Loading...
-    </v-progress-circular>
 
     <!-- No results message-->
-    <p v-if="rows < 1">
+    <p v-if="totalElements < 1 && !batchLoading">
       There are no results to display.<br />
       Please select another Job Execution ID.
     </p>
@@ -26,7 +32,7 @@
       :headers="batchDataFields"
       :items="batchData"
       :items-length="totalElements"
-      :loading="loading"
+      :loading="batchLoading"
       item-value="id"
       @update:options="loadItems"
     >
@@ -60,7 +66,6 @@ export default {
       batchData: [],
       perPage: 10,
       rows: 0,
-      loading: false,
       totalElements: 0,
       itemsPerPage: 10,
       currentPage: 0,
@@ -129,7 +134,7 @@ export default {
         })
         .catch((error) => {
           if (error.response.status) {
-            this.isBatchLoading = false;
+            this.batchLoading = false;
           }
         });
     },
@@ -146,13 +151,13 @@ export default {
       StudentService.getBatchHistory(batchId, page)
         .then((response) => {
           this.batchData = response.data.content;
-          this.rows = response.data.totalElements;
+          this.totalElements = response.data.totalElements;
           this.itemsPerPage = response.data.size;
           this.batchLoading = false;
         })
         .catch((error) => {
           if (error.response.status) {
-            this.isBatchLoading = false;
+            this.BatchLoading = false;
           }
         });
     },
diff --git a/frontend/src/components/Batch/BatchRoutines.vue b/frontend/src/components/Batch/BatchRoutines.vue
index 01f6fd66..b33ac60f 100644
--- a/frontend/src/components/Batch/BatchRoutines.vue
+++ b/frontend/src/components/Batch/BatchRoutines.vue
@@ -1,5 +1,18 @@
 <template>
-  <div>
+  <v-container>
+    <v-overlay
+      v-model="isBatchRoutinesLoading"
+      class="align-center justify-center"
+      contained
+    >
+      <v-progress-circular
+        v-if="isBatchRoutinesLoading"
+        indeterminate
+        color="primary"
+        size="64"
+      >
+      </v-progress-circular>
+    </v-overlay>
     <v-data-table
       :headers="scheduledRoutinesFields"
       :items="batchRoutines"
@@ -45,7 +58,7 @@
       {{ snackbarMessage }}
       <v-btn text @click="snackbarVisible = false">Close</v-btn>
     </v-snackbar>
-  </div>
+  </v-container>
 </template>
 
 <script>
@@ -153,6 +166,7 @@ export default {
   computed: {
     ...mapState(useBatchProcessingStore, {
       batchRoutines: "getBatchRoutines",
+      isBatchRoutinesLoading: "getIsGettingBatchRoutinesLoading",
     }),
     ...mapState(useAccessStore, ["hasPermissions"]),
   },
diff --git a/frontend/src/components/Batch/BatchRuns.vue b/frontend/src/components/Batch/BatchRuns.vue
index e39369f6..a3e8bfbc 100644
--- a/frontend/src/components/Batch/BatchRuns.vue
+++ b/frontend/src/components/Batch/BatchRuns.vue
@@ -1,5 +1,18 @@
 <template>
   <v-container>
+    <v-overlay
+      v-model="isBatchJobsLoading"
+      class="align-center justify-center"
+      contained
+    >
+      <v-progress-circular
+        v-if="isBatchJobsLoading"
+        indeterminate
+        color="primary"
+        size="64"
+      >
+      </v-progress-circular>
+    </v-overlay>
     <v-row>
       <!-- First Column (col-5 for medium screens, col-12 for small screens) -->
       <v-col :cols="12" :md="isBatchShowing || isErrorShowing ? 7 : 12">
@@ -324,6 +337,7 @@ export default {
   computed: {
     ...mapState(useBatchProcessingStore, {
       batchRuns: "getBatchRuns",
+      isBatchJobsLoading: "getIsGettingBatchJobsLoading",
     }),
   },
   methods: {
@@ -335,14 +349,6 @@ export default {
     rerunBatch(bid) {
       BatchProcessingService.rerunBatch(bid).then((response) => {
         if (response) {
-          // this.$bvToast.toast(
-          //   "Created a new batch job based on batch #" + bid,
-          //   {
-          //     title: "NEW BATCH JOB STARTED",
-          //     variant: "success",
-          //     noAutoHide: true,
-          //   }
-          // );
           this.snackbarStore.showSnackbar(
             "Created a new batch job based on batch #" + bid,
             "success",
diff --git a/frontend/src/components/Batch/Forms/ArchiveSchoolReportsForm.vue b/frontend/src/components/Batch/Forms/ArchiveSchoolReportsForm.vue
index 28038fdc..e212ec73 100644
--- a/frontend/src/components/Batch/Forms/ArchiveSchoolReportsForm.vue
+++ b/frontend/src/components/Batch/Forms/ArchiveSchoolReportsForm.vue
@@ -49,7 +49,7 @@
               <v-stepper-window>
                 <v-stepper-window-item value="0">
                   <v-row>
-                    <v-col sm="2"> Report Type </v-col>
+                    <v-col sm="2">Report Type </v-col>
                     <v-col sm="10">
                       <v-select
                         v-model="reportType"
@@ -70,15 +70,21 @@
                         item-title="text"
                         item-value="value"
                         label="Select a report type"
+                        variant="outlined"
+                        class="mt-2"
                       ></v-select>
                     </v-col>
                   </v-row>
                   <v-row>
-                    <v-select
-                      v-model="group"
-                      :items="['School', 'All Schools']"
-                      label="Select a group"
-                    ></v-select>
+                    <v-col>
+                      <v-select
+                        class="mt-2"
+                        v-model="group"
+                        :items="['School', 'All Schools']"
+                        label="Select a group"
+                        variant="outlined"
+                      ></v-select>
+                    </v-col>
                   </v-row>
                   <v-row v-if="group == 'School'">
                     <SchoolInput>
@@ -186,17 +192,9 @@
                 >
                 <v-spacer />
                 <!-- Right Action Button -->
-                <v-btn v-if="step < 3" @click="step++" color="bcGovBlue"
+                <v-btn v-if="step < 1" @click="step++" color="bcGovBlue"
                   >Next</v-btn
                 >
-                <v-btn
-                  v-else-if="getBatchRequest.localDownload == 'Y'"
-                  color="bcGovBlue"
-                  variant="text"
-                  @click="submit"
-                >
-                  Download
-                </v-btn>
                 <v-btn
                   v-else
                   color="error"
@@ -204,7 +202,8 @@
                   class="text-none"
                   density="default"
                   @click="submit"
-                  :disabled="v$.$invalid"
+                  :loading="batchLoading"
+                  :disabled="v$.$invalid || batchLoading"
                   >Submit</v-btn
                 >
               </div>
@@ -237,7 +236,7 @@ export default {
     watch(group, (newValue) => {
       batchRequestFormStore.who = newValue;
       if (newValue == "All Schools") {
-        batchRequestFormStore.setActivityCode("All");
+        batchRequestFormStore.setActivityCode("ALL");
       } else {
         batchRequestFormStore.setActivityCode(null);
       }
@@ -312,6 +311,7 @@ export default {
   },
   data: () => ({
     step: 0,
+    batchLoading: false,
     dialog: false,
     selectedConfirmations: [],
 
@@ -355,6 +355,7 @@ export default {
     },
 
     async submit() {
+      this.batchLoading = true;
       const requestTemplate = [
         "districts",
         "gradDateFrom",
@@ -378,7 +379,7 @@ export default {
           requestPayload,
           this.getBatchRequestCrontime
         );
-
+        this.batchLoading = false;
         if (this.getBatchRequestCrontime) {
           this.snackbarStore.showSnackbar(
             "Archive School Reports Process has been successfully scheduled",
@@ -393,9 +394,13 @@ export default {
             5000
           );
         }
+        this.batchLoading = false;
         this.closeDialogAndResetForm();
         this.setActiveTab("batchRuns");
-        this.updateDashboards();
+        //add a wait before updating dashboard
+        setTimeout(() => {
+          this.updateDashboards();
+        }, 2000);
       } catch (error) {
         this.snackbarStore.showSnackbar(
           "An error occurred: " + error.message,
diff --git a/frontend/src/components/Batch/Forms/ArchiveStudentsForm.vue b/frontend/src/components/Batch/Forms/ArchiveStudentsForm.vue
index 7c7eba3f..8c437fdd 100644
--- a/frontend/src/components/Batch/Forms/ArchiveStudentsForm.vue
+++ b/frontend/src/components/Batch/Forms/ArchiveStudentsForm.vue
@@ -52,9 +52,10 @@
                 <v-stepper-window-item value="0">
                   <v-row>
                     <v-select
+                      class="mt-2"
                       v-model="group"
                       :items="['School', 'All Students']"
-                      label="Select a Group"
+                      label="Select a group"
                     ></v-select>
                   </v-row>
                   <v-row v-if="group == 'School'">
@@ -213,7 +214,8 @@
                   class="text-none"
                   density="default"
                   @click="submit"
-                  :disabled="v$.$invalid"
+                  :loading="batchLoading"
+                  :disabled="v$.$invalid || batchLoading"
                   >Submit</v-btn
                 >
               </div>
@@ -245,7 +247,7 @@ export default {
     watch(group, (newValue) => {
       batchRequestFormStore.who = newValue;
       if (newValue == "All Students") {
-        batchRequestFormStore.setActivityCode("All");
+        batchRequestFormStore.setActivityCode("ALL");
       } else {
         batchRequestFormStore.setActivityCode(null);
       }
@@ -318,6 +320,7 @@ export default {
   },
   data: () => ({
     step: 0,
+    batchLoading: false,
     dialog: false,
     selectedConfirmations: [],
   }),
@@ -380,6 +383,7 @@ export default {
       this.step = step;
     },
     async submit() {
+      this.batchLoading = true;
       const requestTemplate = [
         "credentialTypeCode",
         "districts",
@@ -399,37 +403,41 @@ export default {
         this.getBatchRequest,
         requestTemplate
       );
-      try {
-        let response = await BatchProcessingService.runArchiveStudents(
-          requestPayload,
-          this.getBatchRequestCrontime
-        );
-
-        if (this.getBatchRequestCrontime) {
-          this.snackbarStore.showSnackbar(
-            "Archive student batch process has been successfully scheduled",
-            5000
+      if (this.group == "All Students")
+        try {
+          let response = await BatchProcessingService.runArchiveStudents(
+            requestPayload,
+            this.getBatchRequestCrontime
           );
-        } else {
+          this.batchLoading = false;
+          if (this.getBatchRequestCrontime) {
+            this.snackbarStore.showSnackbar(
+              "Archive student batch process has been successfully scheduled",
+              5000
+            );
+          } else {
+            this.snackbarStore.showSnackbar(
+              "Batch " +
+                response.data.batchId +
+                "- Archive student batch process submitted",
+              "success",
+              5000
+            );
+          }
+          this.closeDialogAndResetForm();
+          this.setActiveTab("batchRuns");
+          //add a wait before updating dashboard
+          setTimeout(() => {
+            this.updateDashboards();
+          }, 2000);
+        } catch (error) {
+          // handle the error and show the notification
           this.snackbarStore.showSnackbar(
-            "Batch " +
-              response.data.batchId +
-              "- Archive student batch process submitted",
-            "success",
+            "An error occurred: " + error.message,
+            "danger",
             5000
           );
         }
-        this.closeDialogAndResetForm();
-        this.setActiveTab("batchRuns");
-        this.updateDashboards();
-      } catch (error) {
-        // handle the error and show the notification
-        this.snackbarStore.showSnackbar(
-          "An error occurred: " + error.message,
-          "danger",
-          5000
-        );
-      }
     },
   },
 };
diff --git a/frontend/src/components/Batch/Forms/DistrunForm.vue b/frontend/src/components/Batch/Forms/DistrunForm.vue
index e6c63d16..27e3f6c1 100644
--- a/frontend/src/components/Batch/Forms/DistrunForm.vue
+++ b/frontend/src/components/Batch/Forms/DistrunForm.vue
@@ -3,7 +3,12 @@
     <v-dialog v-model="dialog" persistent width="1024">
       <template v-slot:activator="{ props }">
         <v-btn
-          v-if="hasPermissions('BATCH', 'runDistrun')"
+          v-if="
+            hasPermissions(
+              'BATCH',
+              'runCredentialsandTranscriptDistributionRun'
+            )
+          "
           color="primary"
           v-bind="props"
           class="mr-2"
@@ -32,7 +37,7 @@
                 :items="[
                   {
                     label: 'Run Type',
-                    value: 'User Request Distribution Run',
+                    value: 'Credentials and Transcript Distribution Run',
                   },
                   {
                     label: 'Where',
@@ -53,7 +58,8 @@
               class="text-none"
               density="default"
               @click="submit"
-              :disabled="v$.$invalid"
+              :loading="batchLoading"
+              :disabled="v$.$invalid || batchLoading"
               >Submit</v-btn
             >
           </div>
@@ -161,6 +167,7 @@ export default {
   data: () => ({
     snackbarStore: useSnackbarStore(),
     step: 0,
+    batchLoading: false,
     dialog: false,
     groupSelected: "",
     transcriptTypes: [],
@@ -270,9 +277,15 @@ export default {
         // eslint-disable-next-line
         .catch((error) => {
           if (error.response.statusText) {
-            this.makeToast("ERROR " + error.response.statusText, "danger");
+            this.snackbarStore.showSnackbar(
+              "ERROR " + error.response.statusText,
+              5000
+            );
           } else {
-            this.makeToast("ERROR " + "error with webservervice", "danger");
+            this.snackbarStore.showSnackbar(
+              "ERROR " + "error with webservervice",
+              5000
+            );
           }
         });
     },
@@ -284,9 +297,15 @@ export default {
         // eslint-disable-next-line
         .catch((error) => {
           if (error.response.statusText) {
-            this.makeToast("ERROR " + error.response.statusText, "danger");
+            this.snackbarStore.showSnackbar(
+              "ERROR " + error.response.statusText,
+              5000
+            );
           } else {
-            this.makeToast("ERROR " + "error with webservervice", "danger");
+            this.snackbarStore.showSnackbar(
+              "ERROR " + "error with webservervice",
+              5000
+            );
           }
         });
     },
@@ -303,6 +322,7 @@ export default {
       this.step = step;
     },
     async submit() {
+      this.batchLoading = true;
       try {
         const requestTemplate = [
           "pens",
@@ -323,10 +343,12 @@ export default {
           this.getBatchRequest,
           requestTemplate
         );
+
         let response = await BatchProcessingService.runDISTRUN_MONTHLY(
           requestPayload,
           this.getBatchRequestCrontime
         );
+        this.batchLoading = false;
         if (response) {
           if (this.getBatchRequestCrontime) {
             this.snackbarStore.showSnackbar(
@@ -343,8 +365,12 @@ export default {
             );
           }
         }
+        this.setActiveTab("batchRuns");
         this.closeDialogAndResetForm();
-        this.updateDashboards();
+        //add a wait before updating dashboard
+        setTimeout(() => {
+          this.updateDashboards();
+        }, 2000);
       } catch (error) {
         // handle the error and show the notification
         console.error("Error:", error);
diff --git a/frontend/src/components/Batch/Forms/DistrunFormYearEndForm.vue b/frontend/src/components/Batch/Forms/DistrunFormYearEndForm.vue
index 7781b38e..8383067c 100644
--- a/frontend/src/components/Batch/Forms/DistrunFormYearEndForm.vue
+++ b/frontend/src/components/Batch/Forms/DistrunFormYearEndForm.vue
@@ -57,7 +57,8 @@
                     <v-select
                       v-model="getGroup"
                       :items="['School Category']"
-                      label="Select a Group"
+                      label="Select a group"
+                      variant="outlined"
                     ></v-select>
                   </v-row>
                   <v-row v-if="getGroup == 'School Category'">
@@ -113,7 +114,8 @@
                   class="text-none"
                   density="default"
                   @click="submit"
-                  :disabled="v$.$invalid"
+                  :loading="batchLoading"
+                  :disabled="v$.$invalid || batchLoading"
                   >Submit</v-btn
                 >
               </div>
@@ -191,6 +193,7 @@ export default {
   },
   data: () => ({
     step: 0,
+    batchLoading: false,
     dialog: false,
   }),
   computed: {
@@ -254,6 +257,7 @@ export default {
       this.step = step;
     },
     async submit() {
+      this.batchLoading = true;
       const requestTemplate = [
         "credentialTypeCode",
         "districts",
@@ -278,7 +282,7 @@ export default {
           requestPayload,
           this.getBatchRequestCrontime
         );
-
+        this.batchLoading = false;
         if (this.getBatchRequestCrontime) {
           this.snackbarStore.showSnackbar(
             "Year-End Credentials and Transcript Distribution Run has been successfully scheduled",
@@ -294,9 +298,11 @@ export default {
           );
         }
         this.closeDialogAndResetForm();
-
         this.setActiveTab("batchRuns");
-        this.updateDashboards();
+        //add a wait before updating dashboard
+        setTimeout(() => {
+          this.updateDashboards();
+        }, 2000);
       } catch (error) {
         this.snackbarStore.showSnackbar(
           "An error occurred: " + error.message,
diff --git a/frontend/src/components/Batch/Forms/DistrunUserForm.vue b/frontend/src/components/Batch/Forms/DistrunUserForm.vue
index 36f6a619..120e36a8 100644
--- a/frontend/src/components/Batch/Forms/DistrunUserForm.vue
+++ b/frontend/src/components/Batch/Forms/DistrunUserForm.vue
@@ -115,6 +115,8 @@
                   <v-row>
                     <v-col>
                       <v-select
+                        class="mt-2"
+                        variant="outlined"
                         v-model="group"
                         :items="groupItems"
                         label="Select group"
@@ -124,7 +126,10 @@
                   </v-row>
 
                   <v-row v-if="group == 'Student'">
-                    <StudentInput></StudentInput>
+                    <StudentInput
+                      runType="DISTRUNUSER"
+                      :credentialType="credentialSelected"
+                    ></StudentInput>
                   </v-row>
                   <v-row v-if="group == 'School Category'">
                     <DistrictInput></DistrictInput>
@@ -214,7 +219,8 @@
                   variant="flat"
                   class="text-none"
                   density="default"
-                  :disabled="v$.$invalid"
+                  :loading="batchLoading"
+                  :disabled="v$.$invalid || batchLoading"
                   @click="submit"
                 >
                   Download
@@ -226,7 +232,8 @@
                   class="text-none"
                   density="default"
                   @click="submit"
-                  :disabled="v$.$invalid"
+                  :loading="batchLoading"
+                  :disabled="v$.$invalid || batchLoading"
                   >Submit</v-btn
                 >
               </div>
@@ -413,6 +420,7 @@ export default {
     snackbarStore: useSnackbarStore(),
     step: 0,
     dialog: false,
+    batchLoading: false,
     groupSelected: "",
     transcriptTypes: [],
     certificateTypes: [],
@@ -543,9 +551,15 @@ export default {
         // eslint-disable-next-line
         .catch((error) => {
           if (error.response.statusText) {
-            this.makeToast("ERROR " + error.response.statusText, "danger");
+            this.snackbarStore.showSnackbar(
+              "ERROR " + error.response.statusText,
+              5000
+            );
           } else {
-            this.makeToast("ERROR " + "error with webservervice", "danger");
+            this.snackbarStore.showSnackbar(
+              "ERROR " + "error with webservervice",
+              5000
+            );
           }
         });
     },
@@ -563,6 +577,7 @@ export default {
       this.step = step;
     },
     async submit() {
+      this.batchLoading = true;
       try {
         const requestTemplate = [
           "credentialTypeCode",
@@ -583,12 +598,20 @@ export default {
           this.getBatchRequest,
           requestTemplate
         );
+        //set schoolOfRecords to "000000"
+        if (
+          this.group == "Ministry of Advanced Education" &&
+          this.getCredential == "Blank certificate print"
+        ) {
+          requestPayload.schoolOfRecords = ["00000000"];
+        }
         let response = await BatchProcessingService.runDISTRUNUSER(
           requestPayload,
           this.getCredential,
           this.getBatchRequestCrontime
         );
         if (response) {
+          this.batchLoading = false;
           if (this.getBatchRequestCrontime) {
             this.snackbarStore.showSnackbar(
               "User distribution batch request has been successfully scheduled",
@@ -604,8 +627,12 @@ export default {
             );
           }
         }
+        this.setActiveTab("batchRuns");
         this.closeDialogAndResetForm();
-        this.updateDashboards();
+        //add a wait before updating dashboard
+        setTimeout(() => {
+          this.updateDashboards();
+        }, 2000);
       } catch (error) {
         // handle the error and show the notification
         console.error("Error:", error);
diff --git a/frontend/src/components/Batch/Forms/FormInputs/DateRangeInput.vue b/frontend/src/components/Batch/Forms/FormInputs/DateRangeInput.vue
index 057610c4..ea7c9adf 100644
--- a/frontend/src/components/Batch/Forms/FormInputs/DateRangeInput.vue
+++ b/frontend/src/components/Batch/Forms/FormInputs/DateRangeInput.vue
@@ -7,6 +7,7 @@
       <v-col md="10">
         <v-select
           v-model="includeStudents"
+          variant="outlined"
           :items="['Current Students', 'Date Range']"
           label="Select which students to include"
           class=""
@@ -16,8 +17,9 @@
         <v-row v-if="includeStudents === 'Date Range'">
           <v-col sm="6">
             <v-text-field
+              variant="outlined"
               label="Graduation Date From:"
-              class="form__input"
+              class="mt-4"
               id="datepicker-birthdate-from"
               v-model="gradDateFrom"
               type="date"
@@ -46,8 +48,9 @@
           </v-col>
           <v-col sm="6">
             <v-text-field
+              variant="outlined"
               label="Graduation Date To:"
-              class="form__input"
+              class="mt-4"
               id="datepicker-birthdate-from"
               v-model="gradDateTo"
               type="date"
@@ -67,9 +70,7 @@
                 new Date(gradDateTo) < new Date(gradDateFrom)
               "
             >
-              <span class="text-red"
-                >End Date must be greater than Start Date.</span
-              >
+              <span color="red">End Date must be greater than Start Date.</span>
             </div>
             <div v-if="v$.gradDateTo.$invalid && !v$.gradDateTo.$pending">
               <span class="text-red">End Date is invalid or required.</span>
diff --git a/frontend/src/components/Batch/Forms/FormInputs/DistributionInput.vue b/frontend/src/components/Batch/Forms/FormInputs/DistributionInput.vue
index d35ca370..f68f5ea4 100644
--- a/frontend/src/components/Batch/Forms/FormInputs/DistributionInput.vue
+++ b/frontend/src/components/Batch/Forms/FormInputs/DistributionInput.vue
@@ -8,6 +8,7 @@
           label="Copies"
           type="number"
           required
+          variant="outlined"
         ></v-text-field>
       </v-col> </v-row
     ><v-row>
@@ -23,6 +24,7 @@
           item-title="title"
           item-value="value"
           label="Where"
+          variant="outlined"
           require
           hide-details
         ></v-select>
diff --git a/frontend/src/components/Batch/Forms/FormInputs/DistrictInput.vue b/frontend/src/components/Batch/Forms/FormInputs/DistrictInput.vue
index fb1076ce..26c65c81 100644
--- a/frontend/src/components/Batch/Forms/FormInputs/DistrictInput.vue
+++ b/frontend/src/components/Batch/Forms/FormInputs/DistrictInput.vue
@@ -17,6 +17,7 @@
               item-value="value"
               label="School Category"
               class="my-2"
+              variant="outlined"
               outlined
               hide-details
             ></v-select>
@@ -43,7 +44,7 @@
               v-if="!selectAllDistricts"
               :items="getDistrictList"
               label="Category"
-              outlined
+              variant="outlined"
               :item-title="districtTitle"
               item-value="districtNumber"
             ></v-autocomplete>
diff --git a/frontend/src/components/Batch/Forms/FormInputs/PSIInput.vue b/frontend/src/components/Batch/Forms/FormInputs/PSIInput.vue
index 4064d37c..deb58e98 100644
--- a/frontend/src/components/Batch/Forms/FormInputs/PSIInput.vue
+++ b/frontend/src/components/Batch/Forms/FormInputs/PSIInput.vue
@@ -7,7 +7,7 @@
           v-model="transmissionMode"
           label="Select a Transmission Mode"
           :items="[{ title: 'Paper', value: 'PAPER' }, 'FTP']"
-          outlined
+          variant="outlined"
           small
           hide-details
         >
@@ -21,7 +21,7 @@
           v-model="psiYear"
           type="number"
           label="Enter PSI Year"
-          outlined
+          variant="outlined"
           small
         >
         </v-text-field>
@@ -36,7 +36,7 @@
           v-model="psi"
           maxlength="3"
           @input="validatePSI"
-          outlined
+          variant="outlined"
         />
 
         <div
diff --git a/frontend/src/components/Batch/Forms/FormInputs/ProgramInput.vue b/frontend/src/components/Batch/Forms/FormInputs/ProgramInput.vue
index 1c391d5c..304be752 100644
--- a/frontend/src/components/Batch/Forms/FormInputs/ProgramInput.vue
+++ b/frontend/src/components/Batch/Forms/FormInputs/ProgramInput.vue
@@ -16,6 +16,7 @@
               :item-title="programTitle"
               item-value="programCode"
               :item-disabled="true"
+              variant="outlined"
             ></v-autocomplete>
           </v-col>
           <v-col sm="2" class="p-2 my-2">
diff --git a/frontend/src/components/Batch/Forms/FormInputs/SchoolInput.vue b/frontend/src/components/Batch/Forms/FormInputs/SchoolInput.vue
index 960ad26f..a85e9ff8 100644
--- a/frontend/src/components/Batch/Forms/FormInputs/SchoolInput.vue
+++ b/frontend/src/components/Batch/Forms/FormInputs/SchoolInput.vue
@@ -18,6 +18,7 @@
           </v-col>
           <v-col md="8">
             <v-autocomplete
+              variant="outlined"
               v-model="mincode"
               label="Select a school to include"
               :items="getSchoolsList"
diff --git a/frontend/src/components/Batch/Forms/FormInputs/StudentInput.vue b/frontend/src/components/Batch/Forms/FormInputs/StudentInput.vue
index c4854691..b454e380 100644
--- a/frontend/src/components/Batch/Forms/FormInputs/StudentInput.vue
+++ b/frontend/src/components/Batch/Forms/FormInputs/StudentInput.vue
@@ -8,7 +8,8 @@
           v-model="pen"
           @input="validateStudent"
           type="number"
-          class="mr-2"
+          variant="outlined"
+          class="mr-2 mt-2"
         ></v-text-field>
       </v-col>
       <v-col md="3">
@@ -16,6 +17,7 @@
           color="bcGovBlue"
           @click="addStudent()"
           :disabled="v$.pen.$invalid || pen == ''"
+          :loading="penLoading"
         >
           Add Student
         </v-btn>
@@ -105,6 +107,7 @@ export default {
   data() {
     return {
       pen: "",
+      penLoading: false,
       penStudentInfo: "",
       penValidating: false,
       validationMessage: "",
@@ -142,6 +145,7 @@ export default {
       this.clearPenStudentInfo();
       const result = await this.v$.$validate();
       if (!result) {
+        this.penLoading = false;
         return;
       }
       this.penValidating = false;
@@ -154,13 +158,16 @@ export default {
       this.clearPenStudentInfo();
     },
     async addStudent() {
+      this.penLoading = true;
       this.validationMessage = "";
       if (this.pen.length == 9) {
         let student = await StudentService.getStudentByPen(this.pen);
         if (student.data && student.data.length === 0) {
           this.validationMessage = "Student not found";
+          this.penLoading = false;
           return false;
         }
+        let studentID = student.data[0].studentID;
 
         let studentGRADStatus = await StudentService.getGraduationStatus(
           student.data[0].studentID
@@ -182,6 +189,7 @@ export default {
           if (studentGRADStatus.data.studentStatusName == "Merged") {
             this.validationMessage =
               this.pen + " is a merged student and not permitted";
+            this.penLoading = false;
             return;
           }
           if (this.runType == "CERT_REGEN") {
@@ -189,6 +197,7 @@ export default {
             if (!studentGRADStatus.data.programCompletionDate) {
               this.validationMessage =
                 "Error: Cannot regenerate a certificate for this student - this student has not completed their program";
+              this.penLoading = false;
               return;
             }
           }
@@ -200,7 +209,7 @@ export default {
           ) {
             let certificate =
               await GraduationReportService.getStudentCertificates(studentID);
-            if (certificate.data.length) {
+            if (certificate?.data.length) {
               //check that certificate has does not have a null distribution date
 
               if (
@@ -209,17 +218,20 @@ export default {
               ) {
                 this.validationMessage =
                   "Cannot reprint certificate for this student. Distribution date is null";
+                this.penLoading = false;
                 return;
               }
             } else {
               if (this.credentialType == "RC") {
                 this.validationMessage =
                   "Cannot reprint certificate for this student.";
+                this.penLoading = false;
                 return;
               }
               if (this.credentialType == "OC") {
                 this.validationMessage =
                   "Cannot print certificate for this student,this student does not have a certificate.";
+                this.penLoading = false;
                 return;
               }
             }
@@ -230,6 +242,7 @@ export default {
           info: this.penStudentInfo,
         });
         this.clearPen();
+        this.penLoading = false;
       }
     },
     removeStudent(pen) {
@@ -241,8 +254,8 @@ export default {
     },
   },
   props: {
-    credentialType: String,
     runType: String,
+    credentialType: String,
   },
 
   computed: {
@@ -250,6 +263,7 @@ export default {
       ...mapState(useBatchRequestFormStore, [
         "getBatchRequest",
         "getBatchRunTime",
+        "getCredential",
       ]),
     },
     isEmpty() {
diff --git a/frontend/src/components/Batch/Forms/GraduationAlgorithmForm.vue b/frontend/src/components/Batch/Forms/GraduationAlgorithmForm.vue
index 077590bc..9fc97cf5 100644
--- a/frontend/src/components/Batch/Forms/GraduationAlgorithmForm.vue
+++ b/frontend/src/components/Batch/Forms/GraduationAlgorithmForm.vue
@@ -52,6 +52,7 @@
                   <v-row>
                     <v-col>
                       <v-select
+                        class="mt-2"
                         v-model="group"
                         :items="[
                           { title: 'Student', value: 'Student' },
@@ -73,7 +74,8 @@
                             ),
                           },
                         ]"
-                        label="Select group"
+                        label="Select a group"
+                        variant="outlined"
                         hide-details
                       >
                         <template v-slot:item="{ props, item }">
@@ -140,7 +142,8 @@
                   class="text-none"
                   density="default"
                   @click="submit"
-                  :disabled="v$.$invalid"
+                  :loading="batchLoading"
+                  :disabled="v$.$invalid || batchLoading"
                   >Submit</v-btn
                 >
               </div>
@@ -266,6 +269,7 @@ export default {
   },
   data: () => ({
     step: 0,
+    batchLoading: false,
     dialog: false,
     snackbarStore: useSnackbarStore(),
     batchProcessingStore: useBatchProcessingStore(),
@@ -313,6 +317,7 @@ export default {
       "updateDashboards",
     ]),
     closeDialogAndResetForm() {
+      this.batchLoading = false;
       this.group = null;
       this.dialog = false;
       this.clearBatchDetails();
@@ -325,7 +330,9 @@ export default {
       this.step = step;
     },
     async submit() {
+      this.batchLoading = true;
       try {
+        this.batchLoading = true;
         const requestTemplate = [
           "districts",
           "gradDateFrom",
@@ -348,6 +355,7 @@ export default {
           requestPayload,
           this.getBatchRequestCrontime
         );
+        this.batchLoading = false;
         if (this.getBatchRequestCrontime) {
           this.snackbarStore.showSnackbar(
             "Graduation Algorithm request has been successfully scheduled",
@@ -362,9 +370,13 @@ export default {
             5000
           );
         }
-        this.closeDialogAndResetForm();
 
+        this.closeDialogAndResetForm();
         this.setActiveTab("batchRuns");
+        //add a wait before updating dashboard
+        setTimeout(() => {
+          this.updateDashboards();
+        }, 2000);
       } catch (error) {
         // handle the error and show the notification
         this.snackbarStore.showSnackbar(
@@ -372,6 +384,7 @@ export default {
           "danger",
           5000
         );
+        this.batchLoading = false;
         console.error("Error:", error);
       }
     },
diff --git a/frontend/src/components/Batch/Forms/NongradDistrunForm.vue b/frontend/src/components/Batch/Forms/NongradDistrunForm.vue
index 3f021d8e..224b25f3 100644
--- a/frontend/src/components/Batch/Forms/NongradDistrunForm.vue
+++ b/frontend/src/components/Batch/Forms/NongradDistrunForm.vue
@@ -55,7 +55,8 @@
                     <v-select
                       v-model="getGroup"
                       :items="['School Category']"
-                      label="Select a Group"
+                      label="Select a group"
+                      variant="outlined"
                     ></v-select>
                   </v-row>
                   <v-row v-if="getGroup == 'School Category'">
@@ -114,7 +115,8 @@
                   class="text-none"
                   density="default"
                   @click="submit"
-                  :disabled="v$.$invalid"
+                  :loading="batchLoading"
+                  :disabled="v$.$invalid || batchLoading"
                   >Submit</v-btn
                 >
               </div>
@@ -192,6 +194,7 @@ export default {
   },
   data: () => ({
     step: 0,
+    batchLoading: false,
     dialog: false,
     snackbarStore: useSnackbarStore(),
   }),
@@ -256,6 +259,7 @@ export default {
       this.step = step;
     },
     async submit() {
+      this.batchLoading = true;
       const requestTemplate = [
         "credentialTypeCode",
         "districts",
@@ -280,7 +284,7 @@ export default {
           requestPayload,
           this.getBatchRequestCrontime
         );
-
+        this.batchLoading = false;
         if (this.getBatchRequestCrontime) {
           this.snackbarStore.showSnackbar(
             "Non-Graduate Transcript Distribution Run has been successfully scheduled",
@@ -297,7 +301,10 @@ export default {
         }
         this.closeDialogAndResetForm();
         this.setActiveTab("batchRuns");
-        this.updateDashboards();
+        //add a wait before updating dashboard
+        setTimeout(() => {
+          this.updateDashboards();
+        }, 2000);
       } catch (error) {
         this.snackbarStore.showSnackbar(
           "An error occurred: " + error.message,
diff --git a/frontend/src/components/Batch/Forms/PSIForm.vue b/frontend/src/components/Batch/Forms/PSIForm.vue
index 8c2e0f6b..2a4cac7c 100644
--- a/frontend/src/components/Batch/Forms/PSIForm.vue
+++ b/frontend/src/components/Batch/Forms/PSIForm.vue
@@ -110,7 +110,8 @@
                   class="text-none"
                   density="default"
                   @click="submit"
-                  :disabled="v$.$invalid"
+                  :loading="batchLoading"
+                  :disabled="v$.$invalid || batchLoading"
                   >Submit</v-btn
                 >
               </div>
@@ -205,6 +206,7 @@ export default {
   },
   data: () => ({
     step: 0,
+    batchLoading: false,
     dialog: false,
     snackbarStore: useSnackbarStore(),
   }),
@@ -266,6 +268,7 @@ export default {
       this.step = step;
     },
     async submit() {
+      this.batchLoading = true;
       try {
         const requestTemplate = [
           "credentialTypeCode",
@@ -292,7 +295,7 @@ export default {
           this.getPsiTrasmissionMode,
           this.getBatchRequestCrontime
         );
-
+        this.batchLoading = false;
         if (this.getBatchRequestCrontime) {
           this.snackbarStore.showSnackbar(
             "PSI Run FTP / Paper has been successfully scheduled",
@@ -308,9 +311,11 @@ export default {
           );
         }
         this.closeDialogAndResetForm();
-
         this.setActiveTab("batchRuns");
-        this.updateDashboards();
+        //add a wait before updating dashboard
+        setTimeout(() => {
+          this.updateDashboards();
+        }, 2000);
       } catch (error) {
         this.snackbarStore.showSnackbar(
           "An error occurred: " + error.message,
diff --git a/frontend/src/components/Batch/Forms/RegenerateCertificateForm.vue b/frontend/src/components/Batch/Forms/RegenerateCertificateForm.vue
index a1334e4f..c5929421 100644
--- a/frontend/src/components/Batch/Forms/RegenerateCertificateForm.vue
+++ b/frontend/src/components/Batch/Forms/RegenerateCertificateForm.vue
@@ -50,6 +50,7 @@
                 <v-stepper-window-item value="0">
                   <v-row>
                     <v-select
+                      class="mt-2"
                       v-model="group"
                       :items="[
                         {
@@ -66,7 +67,8 @@
                           value: 'School Category',
                         },
                       ]"
-                      label="Select a Group"
+                      label="Select a group"
+                      variant="outlined"
                       ><template v-slot:item="{ props, item }">
                         <v-list-item
                           v-bind="props"
@@ -129,7 +131,8 @@
                   class="text-none"
                   density="default"
                   @click="submit"
-                  :disabled="v$.$invalid"
+                  :loading="batchLoading"
+                  :disabled="v$.$invalid || batchLoading"
                   >Submit</v-btn
                 >
               </div>
@@ -240,6 +243,7 @@ export default {
   data: () => ({
     snackbarStore: useSnackbarStore(),
     step: 0,
+    batchLoading: false,
     dialog: false,
   }),
   computed: {
@@ -273,6 +277,7 @@ export default {
       this.step = step;
     },
     async submit() {
+      this.batchLoading = true;
       const requestTemplate = [
         "districts",
         "pens",
@@ -292,7 +297,7 @@ export default {
           requestPayload,
           this.getBatchRequestCrontime
         );
-
+        this.batchLoading = false;
         if (this.getBatchRequestCrontime) {
           this.snackbarStore.showSnackbar(
             "User Request Certificate Regeneration has been successfully scheduled",
@@ -309,7 +314,10 @@ export default {
         }
         this.closeDialogAndResetForm();
         this.setActiveTab("batchRuns");
-        this.updateDashboards();
+        //add a wait before updating dashboard
+        setTimeout(() => {
+          this.updateDashboards();
+        }, 2000);
       } catch (error) {
         this.snackbarStore.showSnackbar(
           "An error occurred: " + error.message,
diff --git a/frontend/src/components/Batch/Forms/RegenerateSchoolReportForm.vue b/frontend/src/components/Batch/Forms/RegenerateSchoolReportForm.vue
index a79131f9..12a665f2 100644
--- a/frontend/src/components/Batch/Forms/RegenerateSchoolReportForm.vue
+++ b/frontend/src/components/Batch/Forms/RegenerateSchoolReportForm.vue
@@ -51,7 +51,9 @@
               <v-stepper-window>
                 <v-stepper-window-item value="0">
                   <v-row>
-                    <v-col sm="2"> Report Type </v-col>
+                    <v-col sm="2" class="mt-3"
+                      ><strong>Report Type</strong></v-col
+                    >
                     <v-col sm="10">
                       <v-select
                         v-model="reportType"
@@ -68,12 +70,15 @@
                         item-title="text"
                         item-value="value"
                         label="Select a report type"
+                        variant="outlined"
+                        class="mt-2"
                       ></v-select>
                     </v-col>
                     <v-col> </v-col>
                   </v-row>
                   <v-row>
                     <v-select
+                      class="mt-2"
                       v-model="group"
                       :item-title="title"
                       :item-value="value"
@@ -83,6 +88,7 @@
                         { title: 'All', value: 'All Schools' },
                       ]"
                       label="Select a group"
+                      variant="outlined"
                     />
                   </v-row>
                   <v-row v-if="group == 'School'">
@@ -145,7 +151,8 @@
                   class="text-none"
                   density="default"
                   @click="submit"
-                  :disabled="v$.$invalid"
+                  :loading="batchLoading"
+                  :disabled="v$.$invalid || batchLoading"
                   >Submit</v-btn
                 >
               </div>
@@ -179,7 +186,7 @@ export default {
     watch(group, (newValue) => {
       batchRequestFormStore.who = newValue;
       if (newValue == "All Schools") {
-        batchRequestFormStore.setActivityCode("All");
+        batchRequestFormStore.setActivityCode("ALL");
       } else {
         batchRequestFormStore.setActivityCode(null);
       }
@@ -257,6 +264,7 @@ export default {
   },
   data: () => ({
     step: 0,
+    batchLoading: false,
     dialog: false,
     snackbarStore: useSnackbarStore(),
     batchProcessingStore: useBatchProcessingStore(),
@@ -297,6 +305,7 @@ export default {
       this.step = step;
     },
     async submit() {
+      this.batchLoading = true;
       try {
         const requestTemplate = [
           "districts",
@@ -320,7 +329,7 @@ export default {
           requestPayload,
           this.getBatchRequestCrontime
         );
-
+        this.batchLoading = false;
         if (this.getBatchRequestCrontime) {
           this.snackbarStore.showSnackbar(
             "User Request School Report Regeneration has been successfully scheduled",
@@ -337,7 +346,10 @@ export default {
         }
         this.closeDialogAndResetForm();
         this.setActiveTab("batchRuns");
-        this.updateDashboards();
+        //add a wait before updating dashboard
+        setTimeout(() => {
+          this.updateDashboards();
+        }, 2000);
       } catch (error) {
         this.snackbarStore.showSnackbar(
           "An error occurred: " + error.message,
diff --git a/frontend/src/components/Batch/Forms/TranscriptAlgorithmDeleteForm.vue b/frontend/src/components/Batch/Forms/TranscriptAlgorithmDeleteForm.vue
index bc250d3d..e55b4cff 100644
--- a/frontend/src/components/Batch/Forms/TranscriptAlgorithmDeleteForm.vue
+++ b/frontend/src/components/Batch/Forms/TranscriptAlgorithmDeleteForm.vue
@@ -51,6 +51,7 @@
                 <v-stepper-window-item value="0">
                   <v-row>
                     <v-select
+                      class="mt-2"
                       v-model="group"
                       :items="[
                         { title: 'Student', value: 'Student' },
@@ -68,7 +69,8 @@
                           disabled: !hasPermissions('BATCH', 'selectAllOption'),
                         },
                       ]"
-                      label="Select a Group"
+                      label="Select a group"
+                      variant="outlined"
                       ><template v-slot:item="{ props, item }">
                         <v-list-item
                           v-bind="props"
@@ -138,7 +140,8 @@
                   class="text-none"
                   density="default"
                   @click="submit"
-                  :disabled="v$.$invalid"
+                  :loading="batchLoading"
+                  :disabled="v$.$invalid || batchLoading"
                   >Submit</v-btn
                 >
               </div>
@@ -170,11 +173,6 @@ export default {
     const group = ref(batchRequestFormStore.who);
     watch(group, (newValue) => {
       batchRequestFormStore.who = newValue;
-      if (newValue == "All Students") {
-        batchRequestFormStore.setActivityCode("ALL");
-      } else {
-        batchRequestFormStore.setActivityCode(null);
-      }
     });
 
     return {
@@ -234,6 +232,7 @@ export default {
   },
   data: () => ({
     step: 0,
+    batchLoading: false,
     dialog: false,
     snackbarStore: useSnackbarStore(),
     batchProcessingStore: useBatchProcessingStore(),
@@ -295,6 +294,7 @@ export default {
       this.step = step;
     },
     async submit() {
+      this.batchLoading = true;
       try {
         const requestTemplate = [
           "credentialTypeCode",
@@ -306,6 +306,7 @@ export default {
           "programs",
           "psiCodes",
           "quantity",
+          "activityCode",
           "reportTypes",
           "schoolCategoryCodes",
           "schoolOfRecords",
@@ -315,11 +316,15 @@ export default {
           this.getBatchRequest,
           requestTemplate
         );
+        requestPayload.reportTypes = ["ACHV"];
+        if (this.group == "All Students") {
+          requestPayload.activityCode = "ALL";
+        }
         let response = await BatchProcessingService.runTVR_DELETE(
           requestPayload,
           this.getBatchRequestCrontime
         );
-
+        this.batchLoading = false;
         if (this.getBatchRequestCrontime) {
           this.snackbarStore.showSnackbar(
             "Transcript verification report delete has been successfully scheduled",
@@ -334,7 +339,10 @@ export default {
         }
         this.closeDialogAndResetForm();
         this.setActiveTab("batchRuns");
-        this.updateDashboards();
+        //add a wait before updating dashboard
+        setTimeout(() => {
+          this.updateDashboards();
+        }, 2000);
       } catch (error) {
         // handle the error and show the notification
         this.snackbarStore.showSnackbar(
diff --git a/frontend/src/components/Batch/Forms/TranscriptAlgorithmForm.vue b/frontend/src/components/Batch/Forms/TranscriptAlgorithmForm.vue
index e4522168..ee492816 100644
--- a/frontend/src/components/Batch/Forms/TranscriptAlgorithmForm.vue
+++ b/frontend/src/components/Batch/Forms/TranscriptAlgorithmForm.vue
@@ -49,38 +49,41 @@
               <v-stepper-window>
                 <v-stepper-window-item value="0">
                   <v-row>
-                    <v-select
-                      v-model="group"
-                      :items="[
-                        { title: 'Student', value: 'Student' },
-                        { title: 'School', value: 'School' },
-                        {
-                          title: 'School Category',
-                          value: 'School Category',
-                          disabled: !this.hasPermissions(
-                            'BATCH',
-                            'selectSchoolCategoryGroup'
-                          ),
-                        },
-                        {
-                          title: 'Program',
-                          value: 'Program',
-                          disabled: !this.hasPermissions(
-                            'BATCH',
-                            'selectProgramGroup'
-                          ),
-                        },
-                      ]"
-                      label="Select group"
-                      hide-details
-                    >
-                      <template v-slot:item="{ props, item }">
-                        <v-list-item
-                          v-bind="props"
-                          :subtitle="item.raw.department"
-                          :disabled="item.raw.disabled"
-                        ></v-list-item> </template
-                    ></v-select>
+                    <v-col>
+                      <v-select
+                        v-model="group"
+                        :items="[
+                          { title: 'Student', value: 'Student' },
+                          { title: 'School', value: 'School' },
+                          {
+                            title: 'School Category',
+                            value: 'School Category',
+                            disabled: !this.hasPermissions(
+                              'BATCH',
+                              'selectSchoolCategoryGroup'
+                            ),
+                          },
+                          {
+                            title: 'Program',
+                            value: 'Program',
+                            disabled: !this.hasPermissions(
+                              'BATCH',
+                              'selectProgramGroup'
+                            ),
+                          },
+                        ]"
+                        label="Select a group"
+                        variant="outlined"
+                        hide-details
+                      >
+                        <template v-slot:item="{ props, item }">
+                          <v-list-item
+                            v-bind="props"
+                            :subtitle="item.raw.department"
+                            :disabled="item.raw.disabled"
+                          ></v-list-item> </template
+                      ></v-select>
+                    </v-col>
                   </v-row>
                   <v-row v-if="group == 'Student'">
                     <StudentInput></StudentInput>
@@ -138,7 +141,8 @@
                   class="text-none"
                   density="default"
                   @click="submit"
-                  :disabled="v$.$invalid"
+                  :loading="batchLoading"
+                  :disabled="v$.$invalid || batchLoading"
                   >Submit</v-btn
                 >
               </div>
@@ -251,6 +255,7 @@ export default {
   },
   data: () => ({
     step: 0,
+
     dialog: false,
     snackbarStore: useSnackbarStore(),
   }),
@@ -312,6 +317,7 @@ export default {
       this.step = step;
     },
     async submit() {
+      this.batchLoading = true;
       try {
         const requestTemplate = [
           "districts",
@@ -335,8 +341,7 @@ export default {
           requestPayload,
           this.getBatchRequestCrontime
         );
-
-        this.activeTab = "batchRuns";
+        this.batchLoading = false;
         if (this.getBatchRequestCrontime) {
           this.snackbarStore.showSnackbar(
             "Transcript verification report has been successfully scheduled",
@@ -349,7 +354,12 @@ export default {
             5000
           );
         }
+        this.setActiveTab("batchRuns");
         this.closeDialogAndResetForm();
+        //add a wait before updating dashboard
+        setTimeout(() => {
+          this.updateDashboards();
+        }, 2000);
       } catch (error) {
         // handle the error and show the notification
         this.snackbarStore.showSnackbar(
diff --git a/frontend/src/components/Batch/ScheduledBatchRuns.vue b/frontend/src/components/Batch/ScheduledBatchRuns.vue
index 97877121..c487f767 100644
--- a/frontend/src/components/Batch/ScheduledBatchRuns.vue
+++ b/frontend/src/components/Batch/ScheduledBatchRuns.vue
@@ -1,5 +1,18 @@
 <template>
-  <div>
+  <v-container>
+    <v-overlay
+      v-model="isScheduledBatchJobsLoading"
+      class="align-center justify-center"
+      contained
+    >
+      <v-progress-circular
+        v-if="isScheduledBatchJobsLoading"
+        indeterminate
+        color="primary"
+        size="64"
+      >
+      </v-progress-circular>
+    </v-overlay>
     <div v-if="adminDashboardLoading">LOADING</div>
     <div v-if="!scheduledJobs.length">No Scheduled Jobs</div>
 
@@ -88,7 +101,7 @@
       {{ snackbar.message }}
       <v-btn text @click="snackbar.show = false">Close</v-btn>
     </v-snackbar>
-  </div>
+  </v-container>
 </template>
 
 <script>
@@ -150,6 +163,7 @@ export default {
   computed: {
     ...mapState(useBatchProcessingStore, {
       scheduledJobs: "getScheduledBatchRuns",
+      isScheduledBatchJobsLoading: "getIsGettingScheduledBatchJobsLoading",
     }),
     sortedScheduledJobs() {
       return [...this.scheduledJobs].sort((a, b) => {
diff --git a/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue b/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
index 96a5485e..5408c0af 100644
--- a/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
+++ b/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
@@ -123,7 +123,7 @@
                   item.studentOptionalProgramData.optionalRequirementsMet
                     .length != 0
                 "
-                >ALL requirements have been met</span
+                >All requirements have been met</span
               >
             </div>
             <div v-else>
@@ -136,7 +136,7 @@
                     .length > 0
                 "
               >
-                ALL Requirements have been met
+                All Requirements have been met
               </div>
             </div>
             <span
diff --git a/frontend/src/services/BatchProcessingService.js b/frontend/src/services/BatchProcessingService.js
index a3297c66..a683e293 100644
--- a/frontend/src/services/BatchProcessingService.js
+++ b/frontend/src/services/BatchProcessingService.js
@@ -40,11 +40,11 @@ export default {
        //For Blank transcript print or Blank certificate print option, the payload must use the blankPayload
       if(credentialType == "Blank transcript print" || credentialType == "Blank certificate print"){
         
-        scheduledRequest.payload = request;
-        scheduledRequest.blankPayLoad = null;
-      }else{
         scheduledRequest.payload = null;
         scheduledRequest.blankPayLoad = request;
+      }else{
+        scheduledRequest.payload = request;
+        scheduledRequest.blankPayLoad = null;
       }
 
       if(credentialType == "OT" && request.psi && request.psi.length >0){
diff --git a/frontend/src/store/modules/batchprocessing.js b/frontend/src/store/modules/batchprocessing.js
index a3c7a43a..52020460 100644
--- a/frontend/src/store/modules/batchprocessing.js
+++ b/frontend/src/store/modules/batchprocessing.js
@@ -10,7 +10,9 @@ export const useBatchProcessingStore = defineStore("batchProcessing", {
     batchRuns: [],
     batchRoutines: [],
     activeTab: "batchRuns",
-
+    gettingBatchJobs: false,
+    gettingScheduledBatchJobs: false,
+    gettingBatchRoutines: false,
     //delete below
     schools: [],
     districts: [],
@@ -42,6 +44,9 @@ export const useBatchProcessingStore = defineStore("batchProcessing", {
   }),
   actions: {
     async updateDashboards() {
+      this.gettingScheduledBatchJobs = true;
+      this.gettingBatchRoutines = true;
+      this.gettingBatchJobs = true;
       await this.setBatchJobs();
       const batchRunScheduledRuns =
         await BatchProcessingService.getScheduledBatchJobs();
@@ -56,12 +61,14 @@ export const useBatchProcessingStore = defineStore("batchProcessing", {
     },
     async setBatchRoutines(payload) {
       this.batchRoutines = payload;
+      this.gettingBatchRoutines = false;
     },
     async setScheduledBatchJobs(payload) {
       this.scheduledBatchJobs = payload;
       for (let value of this.scheduledBatchJobs) {
         value.jobParameters = JSON.parse(value.jobParameters);
       }
+      this.gettingScheduledBatchJobs = false;
     },
     async setBatchJobs() {
       BatchProcessingService.getDashboardInfo()
@@ -73,15 +80,11 @@ export const useBatchProcessingStore = defineStore("batchProcessing", {
           }
           // Set the batchRuns property
           this.batchRuns = batchRunData;
+          this.gettingBatchJobs = false;
         })
         .catch((error) => {
-          this.adminDashboardLoading = false;
+          this.gettingBatchJobs = false;
           if (error.response && error.response.status) {
-            // this.$bvToast.toast("ERROR " + error.response.statusText, {
-            //   title: "ERROR" + error.response.status,
-            //   variant: "danger",
-            //   noAutoHide: true,
-            // });
             this.snackbarStore.showSnackbar(
               "ERROR " + error.response.statusText,
               "error",
@@ -111,15 +114,17 @@ export const useBatchProcessingStore = defineStore("batchProcessing", {
       }
     },
 
-    async setScheduledBatchJobs(payload) {
-      this.scheduledBatchJobs = payload;
-      for (let value of this.scheduledBatchJobs) {
-        value.jobParameters = JSON.parse(value.jobParameters);
-      }
-    },
-    async setBatchRoutines(payload) {
-      this.batchRoutines = payload;
-    },
+    // async setScheduledBatchJobs(payload) {
+    //   this.scheduledBatchJobs = payload;
+    //   for (let value of this.scheduledBatchJobs) {
+    //     value.jobParameters = JSON.parse(value.jobParameters);
+    //   }
+    //   this.gettingScheduledBatchJobs = false;
+    // },
+    // async setBatchRoutines(payload) {
+    //   this.batchRoutines = payload;
+    //   this.gettingBatchRoutines = false;
+    // },
 
     async removeScheduledJobs(payload) {
       const response = await BatchProcessingService.removeScheduledJobs(
@@ -128,12 +133,13 @@ export const useBatchProcessingStore = defineStore("batchProcessing", {
       this.updateDashboards();
       return response;
     },
-    async setScheduledBatchJobs(payload) {
-      this.scheduledBatchJobs = payload;
-      for (let value of this.scheduledBatchJobs) {
-        value.jobParameters = JSON.parse(value.jobParameters);
-      }
-    },
+    // async setScheduledBatchJobs(payload) {
+    //   this.scheduledBatchJobs = payload;
+    //   for (let value of this.scheduledBatchJobs) {
+    //     value.jobParameters = JSON.parse(value.jobParameters);
+    //   }
+    //   this.gettingScheduledBatchJobs = false;
+    // },
   },
   getters: {
     getActiveTab: (state) => {
@@ -142,5 +148,9 @@ export const useBatchProcessingStore = defineStore("batchProcessing", {
     getScheduledBatchRuns: (state) => state.scheduledBatchJobs,
     getBatchRuns: (state) => state.batchRuns,
     getBatchRoutines: (state) => state.batchRoutines,
+    getIsGettingScheduledBatchJobsLoading: (state) =>
+      state.gettingScheduledBatchJobs,
+    getIsGettingBatchRoutinesLoading: (state) => state.gettingBatchRoutines,
+    getIsGettingBatchJobsLoading: (state) => state.gettingBatchJobs,
   },
 });
diff --git a/frontend/src/utils/constants.js b/frontend/src/utils/constants.js
index 5a7391c3..85915e98 100644
--- a/frontend/src/utils/constants.js
+++ b/frontend/src/utils/constants.js
@@ -73,6 +73,9 @@ export const RolePermissions = Object.freeze({
     runDistrun: {
       allowed: ['GRAD_SYSTEM_COORDINATOR', 'GRAD_INFO_OFFICER'],
     },
+    runCredentialsandTranscriptDistributionRun: {
+      allowed: ['GRAD_SYSTEM_COORDINATOR'],
+    },
     runNonGradRun: {
       allowed: ['GRAD_SYSTEM_COORDINATOR'],
     },
@@ -84,7 +87,7 @@ export const RolePermissions = Object.freeze({
     },
     runCertificateRegeneration:{
       allowed: ['GRAD_SYSTEM_COORDINATOR', 'GRAD_INFO_OFFICER'],
-    },
+    },  
     runSchoolReportRegeneration:{
       allowed: ['GRAD_SYSTEM_COORDINATOR'],
     },    
diff --git a/frontend/src/views/BatchProcessing.vue b/frontend/src/views/BatchProcessing.vue
index 2039f098..972a999f 100644
--- a/frontend/src/views/BatchProcessing.vue
+++ b/frontend/src/views/BatchProcessing.vue
@@ -2,7 +2,10 @@
   <div class="batch-processing-view">
     <h1>Batch Processing</h1>
     <div>
-      <v-tabs v-model="activeTab" bg-color="bcGovLightGrey">
+      <v-tabs
+        v-model="batchProcessingStore.activeTab"
+        bg-color="bcGovLightGrey"
+      >
         <v-tab
           value="batchRuns"
           @click="
@@ -284,6 +287,7 @@ export default {
 
     return {
       activeTab,
+      batchProcessingStore,
     };
   },
   computed: {