Deepthi/Melanie | #3222 |BugFix - Cancel link overlapping with success message