diff --git a/.env.example b/.env.example
index 6002fc9c..c186a06a 100644
--- a/.env.example
+++ b/.env.example
@@ -11,7 +11,7 @@ VUE_APP_BASE_URL=
 VUE_APP_ORDER_IN_BRKRNG_FILTERS=["orderTypeId: SALES_ORDER", "facilityId: _NA_", "orderStatusId: ORDER_APPROVED", "!orderItemStatusId: ITEM_CANCELLED" ]
 VUE_APP_PERMISSION_ID=
 VUE_APP_ALIAS=
-VUE_APP_CTGRY_AND_BRKRNG_JOB=["JOB_REL_PREODR_CAT", "JOB_BKR_ORD", "JOB_RLS_ORD_DTE"]
+VUE_APP_CTGRY_AND_BRKRNG_JOB=["JOB_REL_PREODR_CAT", "JOB_RLS_ORD_DTE"]
 VUE_APP_DEFAULT_ALIAS=
 VUE_APP_DEFAULT_LOG_LEVEL="error"
 VUE_APP_LOGIN_URL="http://launchpad.hotwax.io/login"
\ No newline at end of file
diff --git a/src/views/catalog-product-details.vue b/src/views/catalog-product-details.vue
index dbdde1f3..3216c519 100644
--- a/src/views/catalog-product-details.vue
+++ b/src/views/catalog-product-details.vue
@@ -285,7 +285,7 @@
             </ion-item>
           </div>
           <div v-else>
-            <ion-item v-if="Object.keys(getCtgryAndBrkrngJob('JOB_REL_PREODR_CAT')).length" detail button @click="openJobActionsPopover($event, getCtgryAndBrkrngJob('JOB_REL_PREODR_CAT'), 'Pre-sell computation')">
+            <ion-item v-if="Object.keys(getCtgryAndBrkrngJob('JOB_REL_PREODR_CAT')).length" detail button @click.stop="openJobActionsPopover($event, getCtgryAndBrkrngJob('JOB_REL_PREODR_CAT'), 'Pre-sell computation')">
               <ion-label class="ion-text-wrap">
                 <h3>{{ $t('Pre-sell computation') }}</h3>
                 <p>{{ getCtgryAndBrkrngJob('JOB_REL_PREODR_CAT').lastRunTime && timeTillJob(getCtgryAndBrkrngJob('JOB_REL_PREODR_CAT').lastRunTime) }}</p>
diff --git a/src/views/job-actions-popover.vue b/src/views/job-actions-popover.vue
index 4b2ea3dc..3d89da84 100644
--- a/src/views/job-actions-popover.vue
+++ b/src/views/job-actions-popover.vue
@@ -1,18 +1,12 @@
 <template>
   <ion-content>
     <!-- Show "Schedule in every 15 minutes" option for draft jobs only -->
-    <ion-list v-if="job.statusId === 'SERVICE_DRAFT'">
+    <ion-list v-if="(job.statusId === 'SERVICE_DRAFT') || (job.paused === 'Y' && job.nextExecutionDateTime)">
       <ion-item lines="none" button @click="schdlInEvry15Mins()">
         <ion-icon slot="start" :icon="timerOutline" />
         {{ $t("Schedule in every 15 minutes") }}
       </ion-item>
     </ion-list>
-    <ion-list v-else-if="job.paused === 'Y' && job.nextExecutionDateTime">
-      <ion-item lines="none" button @click="schdlInEvry15Mins()">
-        <ion-icon slot="start" :icon="timerOutline" />
-        {{ $t("schedule") }}
-      </ion-item>
-    </ion-list>
     <ion-list v-else>
       <ion-item lines="none" button @click="runNow(job)">
         <ion-icon slot="start" :icon="flashOutline" />
@@ -62,9 +56,6 @@ export default defineComponent({
     IonItem,
     IonList
   },
-  mounted() {
-    console.log(this.job);
-  },
   methods: {
     closeJobActionsPopover() {
       popoverController.dismiss({ dismissed: true });
@@ -109,15 +100,8 @@ export default defineComponent({
       return await jobHistoryModal.present();
     },
     async cancelJob() {
-      let resp;
-      console.log(this.isMaargJob);
-
       try {
-        if(this.isMaargJob) {
-          resp = await JobService.scheduleMaargJob({ routingGroupId: this.job.routingGroupId, paused: 'Y' })
-        } else {
-          resp = await JobService.cancelJob(this.job.jobId)
-        }
+        const resp = await (this.isMaargJob ? JobService.scheduleMaargJob({ routingGroupId: this.job.routingGroupId, paused: 'Y' }) : JobService.cancelJob(this.job.jobId))
 
         if (!hasError(resp)) {
           showToast(translate('Job cancelled successfully'))
@@ -150,13 +134,9 @@ export default defineComponent({
       await alert.present();
     },
     async schdlInEvry15Mins() {
-      let resp;
       try {
-        if(this.isMaargJob) {
-          resp = await JobService.scheduleMaargJob({ routingGroupId: this.job.routingGroupId, paused: 'N' })
-        } else {
-          resp = await JobService.scheduleJob({ job: this.job, frequency: 'EVERY_15_MIN', runTime: '' })
-        }
+        const resp = this.isMaargJob ?  await JobService.scheduleMaargJob({ routingGroupId: this.job.routingGroupId, paused: 'N', cronExpression: '0 */15 * ? * *' }) : await JobService.scheduleJob({ job: this.job, frequency: 'EVERY_15_MIN', runTime: '' })
+
         if (!hasError(resp)) {
           showToast(translate('Service has been scheduled'));
           await Promise.allSettled([this.store.dispatch('job/fetchBrokeringJob'), this.store.dispatch('job/fetchCtgryAndBrkrngJobs')])
diff --git a/src/views/job-history-modal.vue b/src/views/job-history-modal.vue
index 530dd240..04e1d929 100644
--- a/src/views/job-history-modal.vue
+++ b/src/views/job-history-modal.vue
@@ -147,8 +147,6 @@ export default defineComponent({
       this.store.dispatch('util/getServiceStatusDesc')
       await this.fetchJobHistory()
     }
-    console.log(this.jobHistory);
-    
   },
   setup() {
     const store = useStore();