[OE-3765] Fixing the cancel and save buttons