diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js
index 2e9f55d8b077dcad5cf7c592a9822ba3fe2a992d..4215f44e9d662d7c1dc7df7f5590bb794e62d7b0 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js
@@ -1649,7 +1649,7 @@ class SchedulingUnitList extends Component{
             dialog.header= "Confirm Pin/Unpin data after ingest";
             dialog.detail = "Do you want to Pin/Unpin data after ingest for selected Scheduling Units?";
             dialog.content = this.getAutoDeletionDialogContent;
-            dialog.actions = [{id: 'yes', title: 'Confirm', callback: this.setAutoDeletion, className:(this.props.project)?"dialog-btn": ""},
+            dialog.actions = [{id: 'yes', title: 'Pin/Unpin data', callback: this.setAutoDeletion, className:(this.props.project)?"dialog-btn": ""},
             {id: 'no', title: 'Cancel', callback: this.closeDialog, className:(this.props.project)?"dialog-btn": "act-btn-cancel"}];
             dialog.onSubmit = this.setAutoDeletion;
             dialog.width = '55vw';
@@ -1825,8 +1825,8 @@ class SchedulingUnitList extends Component{
            dialog.header= "Confirm to update blueprints from draft";
            dialog.detail = "Do you want to update selected scheduling unit blueprint(s) according to the changed and added task drafts?";
            dialog.content = this.getUpdateSUBDialogContent;
-           dialog.actions = [{id: 'yes', title: 'Confirm', callback: this.updateSUB, className:(this.props.project)?"dialog-btn": ""},
-           {id: 'no', title: 'No', callback: this.closeDialog, className:(this.props.project)?"dialog-btn": "act-btn-cancel"}];
+           dialog.actions = [{id: 'yes', title: 'Update Blueprint(s)', callback: this.updateSUB, className:(this.props.project)?"dialog-btn": ""},
+           {id: 'no', title: 'Cancel', callback: this.closeDialog, className:(this.props.project)?"dialog-btn": "act-btn-cancel"}];
            dialog.onSubmit = this.updateSUB;
            dialog.width = '55vw';
            dialog.showIcon = false;
@@ -1923,8 +1923,8 @@ class SchedulingUnitList extends Component{
                 dialog.header= "Confirm to create draft copy for failed tasks";
                 dialog.detail = "Do you want to create draft copy for failed tasks of the selected Scheduling Unit Blueprint(s)?";
                 dialog.content = this.getCopySpecDlgContent;
-                dialog.actions = [{id: 'yes', title: 'Yes', callback: this.copySpecAndFailedTasks},
-                {id: 'no', title: 'No', className:'act-btn-cancel', callback: this.closeDialog}];
+                dialog.actions = [{id: 'yes', title: 'Create draft tasks', callback: this.copySpecAndFailedTasks},
+                {id: 'no', title: 'Cancel', className:'act-btn-cancel', callback: this.closeDialog}];
                 dialog.onSubmit = this.copySpecAndFailedTasks;
                 dialog.width = '55vw';
                 dialog.showIcon = false;
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js
index dd93d132f6d1b3d033746ad0e9c82d537f992d3d..d235f3a4698bf760775b63a26329caec2df65519 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js
@@ -1585,7 +1585,7 @@ class ViewSchedulingUnit extends Component {
                 dialog.type = "confirmation";
                 dialog.header = "Confirm to mark task(s) as obsolete";
                 dialog.actions = [{ id: 'yes', title: 'Mark as obsolete', className:'act-btn-dispose', callback: this.markObsoleteTasks },
-                                    { id: 'no', title: 'No', className:'act-btn-cancel', callback: this.closeDialog }];
+                                    { id: 'no', title: 'Cancel', className:'act-btn-cancel', callback: this.closeDialog }];
                 dialog.detail = "Warning: Obsolete task(s) will not be copied and dataproducts will not be used for pipelines and ingest. Are you sure you want to make the task(s) obsolete?";
                 dialog.content = this.getObsTaskConfirmDlgContent;
                 dialog.submit = this.markObsoleteTasks;
@@ -1773,8 +1773,9 @@ class ViewSchedulingUnit extends Component {
         dialog.header= "Confirm Pin/Unpin data after ingest";
         dialog.detail = this.state.scheduleunit.output_pinned ? 'Do you want to Unpin data after ingest?' : 'Do you want to Pin data after ingest?';
         dialog.content = '';
-        dialog.actions = [{id: 'yes', title: 'Allow Deletion', className:'act-btn-dispose', callback: this.setAutoDeletion},
-        {id: 'no', title: 'No', className:'act-btn-cancel', callback: this.closeDialog}];
+        dialog.actions = [{id: 'yes', title: this.state.scheduleunit.output_pinned?'Unpin data': 'Pin data', 
+        className: this.state.scheduleunit.output_pinned?'act-btn-dispose':'', callback: this.setAutoDeletion},
+        {id: 'no', title: 'Cancel', className:'act-btn-cancel', callback: this.closeDialog}];
         dialog.onSubmit = this.setAutoDeletion;
         dialog.width = '35vw';
         dialog.showIcon = false;
@@ -1812,7 +1813,7 @@ class ViewSchedulingUnit extends Component {
         dialog.detail = "Do you want to re-run all failed tasks of this Scheduling Unit Blueprint?";
         dialog.content = this.getCopyFailedTasksDlgContent;
         dialog.actions = [{id: 'yes', title: 'Re-run', callback: this.copyFailedTasks},
-        {id: 'no', title: 'No', className:'act-btn-cancel', callback: this.closeDialog}];
+        {id: 'no', title: 'Cancel', className:'act-btn-cancel', callback: this.closeDialog}];
         dialog.onSubmit = this.copyFailedTasks;
         dialog.width = '55vw';
         dialog.showIcon = false;
@@ -1877,8 +1878,8 @@ class ViewSchedulingUnit extends Component {
         dialog.header= "Confirm to update blueprints from draft";
         dialog.detail = "Do you want to update blueprints of the scheduling unit according to the changed and added task drafts?";
         dialog.content = this.getCopyFailedTasksDlgContent;
-        dialog.actions = [{id: 'yes', title: 'Update Blueprint(s)', callback: this.updateSUB},
-        {id: 'no', title: 'No', className:'act-btn-cancel', callback: this.closeDialog}];
+        dialog.actions = [{id: 'yes', title: 'Update Blueprint', callback: this.updateSUB},
+        {id: 'no', title: 'Cancel', className:'act-btn-cancel', callback: this.closeDialog}];
         dialog.onSubmit = this.updateSUB;
         dialog.width = '55vw';
         dialog.showIcon = false;
@@ -1921,7 +1922,7 @@ class ViewSchedulingUnit extends Component {
         dialog.detail = "Do you want to create draft copy for failed tasks of this Scheduling Unit Blueprint?";
         dialog.content = this.getCopyFailedTasksDlgContent;
         dialog.actions = [{id: 'yes', title: 'Create draft tasks', callback: this.copySpecAndFailedTasks},
-        {id: 'no', title: 'No', className:'act-btn-cancel', callback: this.closeDialog}];
+        {id: 'no', title: 'Cancel', className:'act-btn-cancel', callback: this.closeDialog}];
         dialog.onSubmit = this.copySpecAndFailedTasks;
         dialog.width = '55vw';
         dialog.showIcon = false;
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/list.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/list.js
index 9663c059a1dd7874792a7afaa22cd3339baa16b4..ddbab82c8ddfda068414df95e6d7afd4f6308f95 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/list.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/list.js
@@ -715,7 +715,7 @@ export class TaskList extends Component {
             dialog.type = "confirmation";
             dialog.header = "Confirm to mark task(s) as obsolete";
             dialog.actions = [{ id: 'yes', title: 'Mark as obsolete', className:'act-btn-dispose', callback: this.markObsoleteTasks },
-                                { id: 'no', title: 'No', className:'act-btn-cancel', className:'act-btn-cancel', callback: this.closeDialog }];
+                                { id: 'no', title: 'Cancel', className:'act-btn-cancel', className:'act-btn-cancel', callback: this.closeDialog }];
             dialog.detail = "Warning: Obsolete task(s) will not be copied and dataproducts will not be used for pipelines and ingest. Are you sure you want to make the task(s) obsolete?";
             dialog.content = this.getObsTaskConfirmDlgContent;
             dialog.submit = this.markObsoleteTasks;
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/view.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/view.js
index 3d44d36839b0b0a02666a77d58aec2c25b58b99d..2cebc32cabaf0f81724eda93ec0c138a8c0814fe 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/view.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/view.js
@@ -374,7 +374,7 @@ export class TaskView extends Component {
         dialog.type = "confirmation";
         dialog.header = "Confirm to mark task as obsolete";
         dialog.actions = [{ id: 'yes', title: 'Mark as obsolete', className:'act-btn-dispose', callback: this.markTaskObsolete },
-                            { id: 'no', title: 'No', className:'act-btn-cancel', callback: this.closeDialog }];       
+                            { id: 'no', title: 'Cancel', className:'act-btn-cancel', callback: this.closeDialog }];       
         dialog.detail = "Warning: Obsolete tasks will not be copied and dataproducts will not be used for pipelines and ingest. Are you sure you want to make the task obsolete?";       
         dialog.content = '';
         dialog.submit = this.markTaskObsolete;
@@ -628,7 +628,7 @@ export class TaskView extends Component {
                 dialog.type = "confirmation";
                 dialog.header = "Confirm to mark Subtask(s) as obsolete";
                 dialog.actions = [{ id: 'yes', title: 'Mark as obsolete', className:'act-btn-dispose', callback: this.markSubtasksObsolete },
-                                    { id: 'no', title: 'No', className:'act-btn-cancel', callback: this.closeDialog }];
+                                    { id: 'no', title: 'Cancel', className:'act-btn-cancel', callback: this.closeDialog }];
                 dialog.detail = "Warning: Obsolete subtask will not be copied and dataproducts will not be used for pipelines and ingest. Are you sure you want to make the subtask obsolete?";
                 dialog.content = this.getSubtaskObsoleteConfirmContent;
                 dialog.submit = this.markSubtasksObsolete;