[OE-3765] Fixing the cancel and save buttons
[OE-3778] fixed cancel button